1

pom.xml

@@ -15,7 +15,7 @@
 	<name>duckula-ops Tapestry 5 Application</name>
 	<properties>
 		<java.version>1.8</java.version>
-		<tapestry-version>5.6.1</tapestry-version>
+		<tapestry-version>5.7.1</tapestry-version>
 		<tapestry-testify-version>1.0.4</tapestry-testify-version>
 		<tapestry-xpath-version>1.0.1</tapestry-xpath-version>
 		<jackson-version>2.11.2</jackson-version>
@@ -260,7 +260,6 @@
 		<dependency>
 			<groupId>net.wicp.tams</groupId>
 			<artifactId>tams-component</artifactId>
-			<version>1.2.6</version>
 		</dependency>
 
 

src/main/java/net/wicp/tams/duckula/ops/WebTools.java

 package net.wicp.tams.duckula.ops;
 
-import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.http.services.Request;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 

src/main/java/net/wicp/tams/duckula/ops/pages/Index.java

@@ -10,9 +10,9 @@ import org.apache.tapestry5.annotations.InjectPage;
 import org.apache.tapestry5.annotations.OnEvent;
 import org.apache.tapestry5.annotations.Path;
 import org.apache.tapestry5.annotations.SessionState;
+import org.apache.tapestry5.commons.util.CollectionFactory;
+import org.apache.tapestry5.http.services.Request;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.services.Request;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.alibaba.fastjson.JSON;
@@ -22,7 +22,6 @@ import com.alibaba.fastjson.JSONObject;
 import net.wicp.tams.app.duckula.controller.bean.models.SysGlobal;
 import net.wicp.tams.app.duckula.controller.config.constant.ConfigGlobleName;
 import net.wicp.tams.app.duckula.controller.dao.SysGlobalMapper;
-import net.wicp.tams.common.Conf;
 import net.wicp.tams.common.Result;
 import net.wicp.tams.common.apiext.StringUtil;
 import net.wicp.tams.common.constant.dic.YesOrNo;

src/main/java/net/wicp/tams/duckula/ops/pages/Login.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.apache.tapestry5.annotations.Import;
 import org.apache.tapestry5.annotations.SessionState;
+import org.apache.tapestry5.http.services.Request;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
 import org.slf4j.Logger;
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/net/wicp/tams/duckula/ops/pages/Main.java

 package net.wicp.tams.duckula.ops.pages;
 
-import java.util.List;
-
-import org.apache.tapestry5.annotations.OnEvent;
-import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-
-import net.wicp.tams.component.assistbean.Menu;
-import net.wicp.tams.component.constant.ResType;
-
 public class Main {
 
 

src/main/java/net/wicp/tams/duckula/ops/pages/runing/ConsumerManager.java

@@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.runing;
 
 import java.util.Map;
 
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/net/wicp/tams/duckula/ops/pages/runing/DumpManager.java

@@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.runing;
 
 import java.util.Map;
 
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/net/wicp/tams/duckula/ops/pages/runing/TaskManager.java

@@ -5,9 +5,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.alibaba.fastjson.JSON;
@@ -30,7 +30,6 @@ import net.wicp.tams.app.duckula.controller.dao.CommonTaskMapper;
 import net.wicp.tams.app.duckula.controller.dao.CommonVersionMapper;
 import net.wicp.tams.app.duckula.controller.service.DeployService;
 import net.wicp.tams.app.duckula.controller.service.PosService;
-import net.wicp.tams.app.duckula.controller.service.deploy.DeployK8s;
 import net.wicp.tams.common.Result;
 import net.wicp.tams.common.apiext.CollectionUtil;
 import net.wicp.tams.common.apiext.StringUtil;

src/main/java/net/wicp/tams/duckula/ops/pages/setting/CheckpointManager.java

@@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.setting;
 
 import java.util.List;
 
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/net/wicp/tams/duckula/ops/pages/setting/DeployManager.java

@@ -6,10 +6,10 @@ import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.tapestry5.SymbolConstants;
 import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.ioc.annotations.Symbol;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/net/wicp/tams/duckula/ops/pages/setting/InstanceManager.java

@@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.setting;
 
 import java.util.List;
 
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/net/wicp/tams/duckula/ops/pages/setting/MiddlewareManager.java

@@ -3,9 +3,9 @@ package net.wicp.tams.duckula.ops.pages.setting;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/net/wicp/tams/duckula/ops/pages/setting/VersionManager.java

@@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.setting;
 
 import java.util.List;
 
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

src/main/java/net/wicp/tams/duckula/ops/pages/tools/DownLoadHelm3Charts.java

@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 
 import lombok.extern.slf4j.Slf4j;
 import net.wicp.tams.app.duckula.controller.BusiTools;

src/main/java/net/wicp/tams/duckula/ops/pages/tools/ViewPodLog.java

@@ -9,9 +9,9 @@ import java.util.Map;
 import org.apache.commons.io.FileUtils;
 import org.apache.tapestry5.annotations.BeforeRenderTemplate;
 import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestGlobals;
 import org.apache.tapestry5.util.TextStreamResponse;
 
 import com.alibaba.fastjson.JSONObject;
@@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import net.wicp.tams.app.duckula.controller.config.constant.CommandType;
 import net.wicp.tams.app.duckula.controller.service.DeployService;
-import net.wicp.tams.app.duckula.controller.service.K8sService;
 import net.wicp.tams.common.Conf;
 import net.wicp.tams.common.apiext.FreemarkUtil;
 import net.wicp.tams.common.apiext.IOUtil;

src/main/java/net/wicp/tams/duckula/ops/services/AppModule.java

@@ -4,17 +4,18 @@ import java.io.IOException;
 import java.util.UUID;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.MappedConfiguration;
-import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.commons.Configuration;
+import org.apache.tapestry5.commons.MappedConfiguration;
+import org.apache.tapestry5.commons.OrderedConfiguration;
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestFilter;
+import org.apache.tapestry5.http.services.RequestHandler;
+import org.apache.tapestry5.http.services.Response;
 import org.apache.tapestry5.ioc.ServiceBinder;
 import org.apache.tapestry5.ioc.annotations.Contribute;
 import org.apache.tapestry5.ioc.annotations.Local;
 import org.apache.tapestry5.ioc.services.ApplicationDefaults;
 import org.apache.tapestry5.ioc.services.SymbolProvider;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestFilter;
-import org.apache.tapestry5.services.RequestHandler;
-import org.apache.tapestry5.services.Response;
 import org.slf4j.Logger;
 
 import net.wicp.tams.duckula.ops.ajax.AjaxImpl;
@@ -138,7 +139,7 @@ public class AppModule {
 		configuration.add("Timing", filter);
 	}
 
-	public static void contributeIgnoredPathsFilter(org.apache.tapestry5.ioc.Configuration<String> configuration) {
+	public static void contributeIgnoredPathsFilter(Configuration<String> configuration) {
 		configuration.add("/connector");
 		configuration.add("/websocket");		
 	}

src/main/java/net/wicp/tams/duckula/ops/services/DevelopmentModule.java

 package net.wicp.tams.duckula.ops.services;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.commons.MappedConfiguration;
 
 /**
  * This module is automatically included as part of the Tapestry IoC Registry if <em>tapestry.execution-mode</em>

src/main/java/net/wicp/tams/duckula/ops/services/QaModule.java

 package net.wicp.tams.duckula.ops.services;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.Configuration;
-import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.commons.Configuration;
+import org.apache.tapestry5.commons.MappedConfiguration;
 import org.apache.tapestry5.ioc.ServiceBinder;
 import org.apache.tapestry5.services.LibraryMapping;