Changes the location of plugins (wgzhao#106)

Kirito53539 · Jan 16, 2021 · 1100a18 · 1100a18
1 parent 365d352
commit 1100a18
Show file tree

Hide file tree

Showing 365 changed files with 1,693 additions and 1,609 deletions.
diff --git a/package.xml b/package.xml
@@ -34,151 +34,175 @@
         </fileSet>
         <!-- reader -->
         <fileSet>
-            <directory>cassandrareader/target/datax/</directory>
+            <directory>plugin/reader/cassandrareader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>clickhousereader/target/datax/</directory>
+            <directory>plugin/reader/clickhousereader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>dbffilereader/target/datax/</directory>
+            <directory>plugin/reader/dbffilereader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>ftpreader/target/datax/</directory>
+            <directory>plugin/reader/ftpreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hbase11xreader/target/datax/</directory>
+            <directory>plugin/reader/influxdbreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hbase11xsqlreader/target/datax/</directory>
+            <directory>plugin/reader/hbase11xreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hbase20xsqlreader/target/datax/</directory>
+            <directory>plugin/reader/hbase11xsqlreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hdfsreader/target/datax/</directory>
+            <directory>plugin/reader/hbase20xreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hivereader/target/datax/</directory>
+            <directory>plugin/reader/hbase20xsqlreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>jsonfilereader/target/datax/</directory>
+            <directory>plugin/reader/hdfsreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>mongodbreader/target/datax/</directory>
+            <directory>plugin/reader/hivereader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>mysqlreader/target/datax/</directory>
+            <directory>plugin/reader/jsonfilereader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>oraclereader/target/datax/</directory>
+            <directory>plugin/reader/kudureader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>postgresqlreader/target/datax/</directory>
+            <directory>plugin/reader/mongodbreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>redisreader/target/datax/</directory>
+            <directory>plugin/reader/mysqlreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>rdbmsreader/target/datax/</directory>
+            <directory>plugin/reader/oraclereader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>sqlserverreader/target/datax/</directory>
+            <directory>plugin/reader/postgresqlreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>streamreader/target/datax/</directory>
+            <directory>plugin/reader/redisreader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>txtfilereader/target/datax/</directory>
+            <directory>plugin/reader/rdbmsreader/target/datax/</directory>
+            <includes>
+                <include>**/*.*</include>
+            </includes>
+            <fileMode>0644</fileMode>
+            <outputDirectory>datax-${project.version}</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>plugin/reader/sqlserverreader/target/datax/</directory>
+            <includes>
+                <include>**/*.*</include>
+            </includes>
+            <fileMode>0644</fileMode>
+            <outputDirectory>datax-${project.version}</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>plugin/reader/streamreader/target/datax/</directory>
+            <includes>
+                <include>**/*.*</include>
+            </includes>
+            <fileMode>0644</fileMode>
+            <outputDirectory>datax-${project.version}</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>plugin/reader/txtfilereader/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
@@ -188,71 +212,90 @@
 
         <!-- writer -->
         <fileSet>
-            <directory>cassandrawriter/target/datax/</directory>
+            <directory>plugin/writer/cassandrawriter/target/datax/</directory>
+            <includes>
+                <include>**/*.*</include>
+            </includes>
+            <fileMode>0644</fileMode>
+            <outputDirectory>datax-${project.version}</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>plugin/writer/clickhousewriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>clickhousewriter/target/datax/</directory>
+            <directory>plugin/writer/dbffilewriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>dbffilewriter/target/datax/</directory>
+            <directory>plugin/writer/elasticsearchwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>elasticsearchwriter/target/datax/</directory>
+            <directory>plugin/writer/ftpwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>ftpwriter/target/datax/</directory>
+            <directory>plugin/writer/greenplum/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hbase11xsqlwriter/target/datax/</directory>
+            <directory>plugin/writer/hbase11xsqlwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hbase11xwriter/target/datax/</directory>
+            <directory>plugin/writer/hbase11xwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hbase20xsqlwriter/target/datax/</directory>
+            <directory>plugin/writer/hbase20xsqlwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>hdfswriter/target/datax/</directory>
+            <directory>plugin/writer/hdfswriter/target/datax/</directory>
+            <includes>
+                <include>**/*.*</include>
+            </includes>
+            <excludes>
+                <exclude>**/datax-common*.jar</exclude>
+            </excludes>
+            <fileMode>0644</fileMode>
+            <outputDirectory>datax-${project.version}</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>plugin/writer/kuduwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
@@ -263,71 +306,71 @@
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>mongodbwriter/target/datax/</directory>
+            <directory>plugin/writer/mongodbwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>mysqlwriter/target/datax/</directory>
+            <directory>plugin/writer/mysqlwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>oraclewriter/target/datax/</directory>
+            <directory>plugin/writer/oraclewriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>postgresqlwriter/target/datax/</directory>
+            <directory>plugin/writer/postgresqlwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>rdbmswriter/target/datax/</directory>
+            <directory>plugin/writer/rdbmswriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>rediswriter/target/datax/</directory>
+            <directory>plugin/writer/rediswriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>sqlserverwriter/target/datax/</directory>
+            <directory>plugin/writer/sqlserverwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>streamwriter/target/datax/</directory>
+            <directory>plugin/writer/streamwriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>
             <fileMode>0644</fileMode>
             <outputDirectory>datax-${project.version}</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>txtfilewriter/target/datax/</directory>
+            <directory>plugin/writer/txtfilewriter/target/datax/</directory>
             <includes>
                 <include>**/*.*</include>
             </includes>

diff --git a/cassandrareader/package.xml → plugin/reader/cassandrareader/package.xml b/cassandrareader/package.xml → plugin/reader/cassandrareader/package.xml
diff --git a/cassandrareader/pom.xml → plugin/reader/cassandrareader/pom.xml b/cassandrareader/pom.xml → plugin/reader/cassandrareader/pom.xml
@@ -5,6 +5,7 @@
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
         <version>3.1.8-SNAPSHOT</version>
+<relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>cassandrareader</artifactId>

diff --git a/...ader/cassandrareader/CassandraReader.java → ...ader/cassandrareader/CassandraReader.java b/...ader/cassandrareader/CassandraReader.java → ...ader/cassandrareader/CassandraReader.java
diff --git a/...andrareader/CassandraReaderErrorCode.java → ...andrareader/CassandraReaderErrorCode.java b/...andrareader/CassandraReaderErrorCode.java → ...andrareader/CassandraReaderErrorCode.java
diff --git a/...assandrareader/CassandraReaderHelper.java → ...assandrareader/CassandraReaderHelper.java b/...assandrareader/CassandraReaderHelper.java → ...assandrareader/CassandraReaderHelper.java
diff --git a/...ax/plugin/reader/cassandrareader/Key.java → ...ax/plugin/reader/cassandrareader/Key.java b/...ax/plugin/reader/cassandrareader/Key.java → ...ax/plugin/reader/cassandrareader/Key.java
diff --git a/...r/cassandrareader/LocalStrings.properties → ...r/cassandrareader/LocalStrings.properties b/...r/cassandrareader/LocalStrings.properties → ...r/cassandrareader/LocalStrings.properties
diff --git a/...andrareader/LocalStrings_en_US.properties → ...andrareader/LocalStrings_en_US.properties b/...andrareader/LocalStrings_en_US.properties → ...andrareader/LocalStrings_en_US.properties
diff --git a/...andrareader/LocalStrings_ja_JP.properties → ...andrareader/LocalStrings_ja_JP.properties b/...andrareader/LocalStrings_ja_JP.properties → ...andrareader/LocalStrings_ja_JP.properties
diff --git a/...andrareader/LocalStrings_zh_CN.properties → ...andrareader/LocalStrings_zh_CN.properties b/...andrareader/LocalStrings_zh_CN.properties → ...andrareader/LocalStrings_zh_CN.properties
diff --git a/...andrareader/LocalStrings_zh_HK.properties → ...andrareader/LocalStrings_zh_HK.properties b/...andrareader/LocalStrings_zh_HK.properties → ...andrareader/LocalStrings_zh_HK.properties
diff --git a/...andrareader/LocalStrings_zh_TW.properties → ...andrareader/LocalStrings_zh_TW.properties b/...andrareader/LocalStrings_zh_TW.properties → ...andrareader/LocalStrings_zh_TW.properties
diff --git a/...ndrareader/src/main/resources/plugin.json → ...ndrareader/src/main/resources/plugin.json b/...ndrareader/src/main/resources/plugin.json → ...ndrareader/src/main/resources/plugin.json
diff --git a/...c/main/resources/plugin_job_template.json → ...c/main/resources/plugin_job_template.json b/...c/main/resources/plugin_job_template.json → ...c/main/resources/plugin_job_template.json
diff --git a/clickhousereader/package.xml → plugin/reader/clickhousereader/package.xml b/clickhousereader/package.xml → plugin/reader/clickhousereader/package.xml
diff --git a/clickhousereader/pom.xml → plugin/reader/clickhousereader/pom.xml b/clickhousereader/pom.xml → plugin/reader/clickhousereader/pom.xml
@@ -5,6 +5,7 @@
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
         <version>3.1.8-SNAPSHOT</version>
+<relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>clickhousereader</artifactId>
     <name>clickhousereader</name>

diff --git a/...er/clickhousereader/ClickHouseReader.java → ...er/clickhousereader/ClickHouseReader.java b/...er/clickhousereader/ClickHouseReader.java → ...er/clickhousereader/ClickHouseReader.java
diff --git a/...ousereader/src/main/resources/plugin.json → ...ousereader/src/main/resources/plugin.json b/...ousereader/src/main/resources/plugin.json → ...ousereader/src/main/resources/plugin.json
diff --git a/...c/main/resources/plugin_job_template.json → ...c/main/resources/plugin_job_template.json b/...c/main/resources/plugin_job_template.json → ...c/main/resources/plugin_job_template.json
diff --git a/dbffilereader/package.xml → plugin/reader/dbffilereader/package.xml b/dbffilereader/package.xml → plugin/reader/dbffilereader/package.xml
diff --git a/dbffilereader/pom.xml → plugin/reader/dbffilereader/pom.xml b/dbffilereader/pom.xml → plugin/reader/dbffilereader/pom.xml
@@ -4,6 +4,7 @@
         <groupId>com.alibaba.datax</groupId>
         <artifactId>datax-all</artifactId>
         <version>3.1.8-SNAPSHOT</version>
+<relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>dbffilereader</artifactId>
     <name>dbffilereader</name>

diff --git a/...plugin/reader/dbffilereader/Constant.java → ...plugin/reader/dbffilereader/Constant.java b/...plugin/reader/dbffilereader/Constant.java → ...plugin/reader/dbffilereader/Constant.java
diff --git a/...n/reader/dbffilereader/DbfFileReader.java → ...n/reader/dbffilereader/DbfFileReader.java b/...n/reader/dbffilereader/DbfFileReader.java → ...n/reader/dbffilereader/DbfFileReader.java