small fix

datavane · May 4, 2023 · a1d666b · a1d666b
1 parent f11e2ff
commit a1d666b
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -83,6 +83,7 @@ TIS基于数据库元数据信息自动生成Flink-SQL脚本,您没看错全部
 - Flink Extend [https://github.com/qlangtech/flink](https://github.com/qlangtech/flink)
 - Chunjun [https://github.com/qlangtech/chunjun](https://github.com/qlangtech/chunjun)
 - Zeppelin [https://github.com/qlangtech/zeppelin](https://github.com/qlangtech/zeppelin)
+- 部分插件参数配置参考 Airbyte [https://github.com/airbytehq/airbyte](https://github.com/airbytehq/airbyte) 
 
 ## 如何开发
 

diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,6 @@
 
         <module>maven-tpi-plugin</module>
         <module>tis-datax-executor</module>
-        <module>tis-logback-flume-parent</module>
         <!--        <module>tis-zeppelin</module>-->
 
 
@@ -736,23 +735,23 @@
                 <version>1.1</version>
             </dependency>
 
-<!--            <dependency>-->
-<!--                <groupId>org.scala-lang</groupId>-->
-<!--                <artifactId>scala-library</artifactId>-->
-<!--                <version>${scala.version}</version>-->
-<!--            </dependency>-->
+            <!--            <dependency>-->
+            <!--                <groupId>org.scala-lang</groupId>-->
+            <!--                <artifactId>scala-library</artifactId>-->
+            <!--                <version>${scala.version}</version>-->
+            <!--            </dependency>-->
 
-<!--            <dependency>-->
-<!--                <groupId>org.scala-lang</groupId>-->
-<!--                <artifactId>scala-reflect</artifactId>-->
-<!--                <version>${scala.version}</version>-->
-<!--            </dependency>-->
+            <!--            <dependency>-->
+            <!--                <groupId>org.scala-lang</groupId>-->
+            <!--                <artifactId>scala-reflect</artifactId>-->
+            <!--                <version>${scala.version}</version>-->
+            <!--            </dependency>-->
 
-<!--            <dependency>-->
-<!--                <groupId>org.scala-lang</groupId>-->
-<!--                <artifactId>scala-compiler</artifactId>-->
-<!--                <version>${scala.version}</version>-->
-<!--            </dependency>-->
+            <!--            <dependency>-->
+            <!--                <groupId>org.scala-lang</groupId>-->
+            <!--                <artifactId>scala-compiler</artifactId>-->
+            <!--                <version>${scala.version}</version>-->
+            <!--            </dependency>-->
 
 
             <!--            <dependency>-->
@@ -877,6 +876,19 @@
 
     <profiles>
 
+        <profile>
+            <id>install</id>
+            <activation>
+                <property>
+                    <name>maven.test.skip</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <modules>
+                <module>tis-logback-flume-parent</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>github-repo</id>
             <repositories>

diff --git 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
@@ -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
@@ -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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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
@@ -6,10 +6,10 @@
         <artifactId>tis-logback-flume-parent</artifactId>
         <groupId>com.qlangtech.tis</groupId>
         <version>3.7.1</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.qlangtech.tis</groupId>
     <artifactId>logback-flume-server-test</artifactId>
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>

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
@@ -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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 百岁（[email protected]）
+ * @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/...sPropertiesFileConfigurationProvider.java → ...sPropertiesFileConfigurationProvider.java b/...sPropertiesFileConfigurationProvider.java → ...sPropertiesFileConfigurationProvider.java
diff --git a/tis-logback-flume-parent/logback-flume-server/pom.xml b/tis-logback-flume-parent/logback-flume-server/pom.xml
@@ -70,7 +70,7 @@
                                     <exclude>org.apache.velocity:*</exclude>
                                     <exclude>org.eclipse.jetty:*</exclude>
                                     <exclude>org.apache.mina:*</exclude>
-                                    <exclude>org.apache.flume.flume-ng-sinks:*</exclude>
+<!--                                    <exclude>org.apache.flume.flume-ng-sinks:*</exclude>-->
                                     <exclude>commons-dbcp:*</exclude>
                                     <exclude>org.apache.curator:*</exclude>
                                 </excludes>
@@ -91,5 +91,9 @@
             <groupId>com.qlangtech.tis</groupId>
             <artifactId>tis-manage-pojo</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/tis-plugin-sezpoz/pom.xml b/tis-plugin-sezpoz/pom.xml
@@ -24,6 +24,7 @@
         <artifactId>tis</artifactId>
         <groupId>com.qlangtech.tis</groupId>
         <version>3.7.1</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>