diff --git a/tis-assemble/src/test/java/StartAssembleWeb.java b/tis-assemble/src/test/java/StartAssembleWeb.java
index e0398119b..cd8a9c8bd 100644
--- a/tis-assemble/src/test/java/StartAssembleWeb.java
+++ b/tis-assemble/src/test/java/StartAssembleWeb.java
@@ -43,7 +43,7 @@ public class StartAssembleWeb extends TestCase {
}
public void testStart() throws Exception {
-
+ System.out.println( this.getClass().getClassLoader().loadClass("com.alibaba.datax.common.statistics.PerfTrace"));
// System.setProperty(com.qlangtech.tis.fullbuild.indexbuild.IRemoteTaskTrigger.KEY_DELTA_STREM_DEBUG, "true");
System.setProperty(DataxUtils.EXEC_TIMESTAMP, String.valueOf(TimeFormat.getCurrentTimeStamp()));
diff --git a/tis-assemble/src/test/java/TestAll.java b/tis-assemble/src/test/java/TestAll.java
index fcd198714..0a5645e3e 100644
--- a/tis-assemble/src/test/java/TestAll.java
+++ b/tis-assemble/src/test/java/TestAll.java
@@ -19,7 +19,6 @@
import com.qlangtech.tis.exec.TestActionInvocation;
import com.qlangtech.tis.exec.datax.TestDataXExecuteInterceptor;
import com.qlangtech.tis.exec.datax.TestDataXExecuteInterceptorForMethodBuildTaskTriggers;
-import com.qlangtech.tis.flume.TestTisPropertiesFileConfigurationProvider;
import com.qlangtech.tis.full.dump.TestDefaultChainContext;
import com.qlangtech.tis.fullbuild.servlet.TestTisServlet;
import com.qlangtech.tis.fullbuild.taskflow.TestReactor;
@@ -38,7 +37,7 @@
@RunWith(Suite.class)
@Suite.SuiteClasses(
{TestDataXExecuteInterceptorForMethodBuildTaskTriggers.class
- , TestTisPropertiesFileConfigurationProvider.class
+
, TestDataXExecuteInterceptor.class
, TestDataXExecuteInterceptor.class
, TestRealtimeLoggerCollectorAppender.class
diff --git a/tis-datax-executor/src/main/java/com/qlangtech/tis/datax/TISJarLoader.java b/tis-datax-executor/src/main/java/com/qlangtech/tis/datax/TISJarLoader.java
index 61b38dfeb..87d0aa9bc 100644
--- a/tis-datax-executor/src/main/java/com/qlangtech/tis/datax/TISJarLoader.java
+++ b/tis-datax-executor/src/main/java/com/qlangtech/tis/datax/TISJarLoader.java
@@ -1,23 +1,24 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package com.qlangtech.tis.datax;
+import com.alibaba.datax.core.util.container.JarLoader;
import com.qlangtech.tis.extension.PluginManager;
import com.qlangtech.tis.extension.UberClassLoader;
@@ -32,7 +33,12 @@ public class TISJarLoader extends com.alibaba.datax.core.util.container.JarLoade
private final PluginManager pluginManager;
public TISJarLoader(PluginManager pluginManager) {
- super(new String[]{"."});
+ this(pluginManager, JarLoader.class.getClassLoader());
+ }
+
+
+ public TISJarLoader(PluginManager pluginManager, ClassLoader parent) {
+ super(new String[]{"."}, parent);
this.pluginManager = pluginManager;
}
diff --git a/tis-logback-flume-parent/logback-flume-server-test/pom.xml b/tis-logback-flume-parent/logback-flume-server-test/pom.xml
index 462b02ada..7b04f6096 100644
--- a/tis-logback-flume-parent/logback-flume-server-test/pom.xml
+++ b/tis-logback-flume-parent/logback-flume-server-test/pom.xml
@@ -6,10 +6,10 @@
tis-logback-flume-parent
com.qlangtech.tis
3.7.1
+ ../pom.xml
4.0.0
- com.qlangtech.tis
logback-flume-server-test
true
diff --git a/tis-logback-flume-parent/logback-flume-server-test/src/test/java/TestAll.java b/tis-logback-flume-parent/logback-flume-server-test/src/test/java/TestAll.java
new file mode 100644
index 000000000..bda3f5305
--- /dev/null
+++ b/tis-logback-flume-parent/logback-flume-server-test/src/test/java/TestAll.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.qlangtech.tis.flume.TestTisPropertiesFileConfigurationProvider;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author 百岁（baisui@qlangtech.com）
+ * @date 2020/04/13
+ */
+
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses(
+ {TestTisPropertiesFileConfigurationProvider.class
+ })
+public class TestAll //extends TestCase
+{
+ static {
+ System.setProperty("logback.configurationFile", "src/main/resources/logback-assemble.xml");
+ }
+
+// public static Test suite() {
+// TestSuite suite = new TestSuite();
+// suite.addTestSuite();
+// suite.addTestSuite();
+// suite.addTestSuite();
+// suite.addTestSuite();
+// // suite.addTestSuite(TestIndexSwapTaskflowLauncher.class);
+// // suite.addTestSuite(TestIndexSwapTaskflowLauncherWithSingleTableIndexBuild.class);
+// suite.addTestSuite();
+// suite.addTestSuite();
+// suite.addTestSuite();
+// suite.addTestSuite();
+// suite.addTestSuite();
+// return suite;
+// }
+}
diff --git a/tis-assemble/src/test/java/com/qlangtech/tis/flume/TestTisPropertiesFileConfigurationProvider.java b/tis-logback-flume-parent/logback-flume-server-test/src/test/java/com/qlangtech/tis/flume/TestTisPropertiesFileConfigurationProvider.java
similarity index 100%
rename from tis-assemble/src/test/java/com/qlangtech/tis/flume/TestTisPropertiesFileConfigurationProvider.java
rename to tis-logback-flume-parent/logback-flume-server-test/src/test/java/com/qlangtech/tis/flume/TestTisPropertiesFileConfigurationProvider.java
diff --git a/tis-logback-flume-parent/logback-flume-server/pom.xml b/tis-logback-flume-parent/logback-flume-server/pom.xml
index 57dc2d8f8..b1368ed03 100644
--- a/tis-logback-flume-parent/logback-flume-server/pom.xml
+++ b/tis-logback-flume-parent/logback-flume-server/pom.xml
@@ -70,7 +70,7 @@
org.apache.velocity:*
org.eclipse.jetty:*
org.apache.mina:*
- org.apache.flume.flume-ng-sinks:*
+
commons-dbcp:*
org.apache.curator:*
@@ -91,5 +91,9 @@
com.qlangtech.tis
tis-manage-pojo
+
+ junit
+ junit
+
diff --git a/tis-plugin-sezpoz/pom.xml b/tis-plugin-sezpoz/pom.xml
index 9a2e8acd7..d7bbcd1eb 100644
--- a/tis-plugin-sezpoz/pom.xml
+++ b/tis-plugin-sezpoz/pom.xml
@@ -24,6 +24,7 @@
tis
com.qlangtech.tis
3.7.1
+ ../pom.xml
4.0.0