merge datasource module

apache · Jul 16, 2023 · 08333d8 · 08333d8
1 parent de7ad07
commit 08333d8
Show file tree

Hide file tree

Showing 23 changed files with 73 additions and 227 deletions.
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
@@ -101,6 +101,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>scala-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>

diff --git a/...nts/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml b/...nts/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml
@@ -183,6 +183,73 @@
             </excludes>
         </dependencySet>
     </dependencySets>
-
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/../service/elasticsearch/target/out/lib</directory>
+            <fileMode>0755</fileMode>
+            <outputDirectory>lib/service/elasticsearch</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>*-javadoc.jar</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../service/hive/target/out/lib</directory>
+            <fileMode>0755</fileMode>
+            <outputDirectory>lib/service/hive</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>*-javadoc.jar</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../service/kafka/target/out/lib</directory>
+            <fileMode>0755</fileMode>
+            <outputDirectory>lib/service/kafka</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>*-javadoc.jar</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../service/jdbc/target/out/lib</directory>
+            <fileMode>0755</fileMode>
+            <outputDirectory>lib/service/jdbc</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>*-javadoc.jar</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../service/hdfs/target/out/lib</directory>
+            <fileMode>0755</fileMode>
+            <outputDirectory>lib/service/hdfs</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>*-javadoc.jar</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/../service/mongodb/target/out/lib</directory>
+            <fileMode>0755</fileMode>
+            <outputDirectory>lib/service/mongodb</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <excludes>
+                <exclude>*-javadoc.jar</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
 </assembly>
 
diff --git a/...erver/LinkisMetadataQueryApplication.java → ...erver/LinkisMetadataQueryApplication.java b/...erver/LinkisMetadataQueryApplication.java → ...erver/LinkisMetadataQueryApplication.java
diff --git a/...server/loader/MetaClassLoaderManager.java → ...server/loader/MetaClassLoaderManager.java b/...server/loader/MetaClassLoaderManager.java → ...server/loader/MetaClassLoaderManager.java
diff --git a/...y/server/restful/MetadataCoreRestful.java → ...y/server/restful/MetadataCoreRestful.java b/...y/server/restful/MetadataCoreRestful.java → ...y/server/restful/MetadataCoreRestful.java
diff --git a/.../server/restful/MetadataQueryRestful.java → .../server/restful/MetadataQueryRestful.java b/.../server/restful/MetadataQueryRestful.java → .../server/restful/MetadataQueryRestful.java
diff --git a/.../server/service/MetadataQueryService.java → .../server/service/MetadataQueryService.java b/.../server/service/MetadataQueryService.java → .../server/service/MetadataQueryService.java
diff --git a/...ervice/impl/MetadataQueryServiceImpl.java → ...ervice/impl/MetadataQueryServiceImpl.java b/...ervice/impl/MetadataQueryServiceImpl.java → ...ervice/impl/MetadataQueryServiceImpl.java
diff --git a/...ata/query/server/utils/MetadataUtils.java → ...ata/query/server/utils/MetadataUtils.java b/...ata/query/server/utils/MetadataUtils.java → ...ata/query/server/utils/MetadataUtils.java
diff --git a/...ry/server/receiver/BaseMetaReceiver.scala → ...ry/server/receiver/BaseMetaReceiver.scala b/...ry/server/receiver/BaseMetaReceiver.scala → ...ry/server/receiver/BaseMetaReceiver.scala
diff --git a/...ta/query/server/WebApplicationServer.java → ...ta/query/server/WebApplicationServer.java b/...ta/query/server/WebApplicationServer.java → ...ta/query/server/WebApplicationServer.java
diff --git a/...er/loader/MetaClassLoaderManagerTest.java → ...er/loader/MetaClassLoaderManagerTest.java b/...er/loader/MetaClassLoaderManagerTest.java → ...er/loader/MetaClassLoaderManagerTest.java
diff --git a/...server/receiver/BaseMetaReceiverTest.java → ...server/receiver/BaseMetaReceiverTest.java b/...server/receiver/BaseMetaReceiverTest.java → ...server/receiver/BaseMetaReceiverTest.java
diff --git a/...rver/restful/MetadataCoreRestfulTest.java → ...rver/restful/MetadataCoreRestfulTest.java b/...rver/restful/MetadataCoreRestfulTest.java → ...rver/restful/MetadataCoreRestfulTest.java
diff --git a/...ver/restful/MetadataQueryRestfulTest.java → ...ver/restful/MetadataQueryRestfulTest.java b/...ver/restful/MetadataQueryRestfulTest.java → ...ver/restful/MetadataQueryRestfulTest.java
diff --git a/...tadata/query/server/restful/MvcUtils.java → ...tadata/query/server/restful/MvcUtils.java b/...tadata/query/server/restful/MvcUtils.java → ...tadata/query/server/restful/MvcUtils.java
diff --git a/.../common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java b/.../common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
diff --git a/...cements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml b/...cements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml
diff --git a/.../linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties b/.../linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties
diff --git a/...ce/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java b/...ce/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java
diff --git a/linkis-public-enhancements/linkis-datasource/pom.xml b/linkis-public-enhancements/linkis-datasource/pom.xml
@@ -36,7 +36,6 @@
     <module>linkis-metadata-query/service/jdbc</module>
     <module>linkis-metadata-query/service/hdfs</module>
     <module>linkis-metadata-query/service/mongodb</module>
-    <module>linkis-metadata-query/server</module>
     <module>linkis-datasource-client</module>
   </modules>
 </project>
diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml
@@ -65,7 +65,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.linkis</groupId>
-      <artifactId>linkis-metadata-query-server</artifactId>
+      <artifactId>linkis-datasource-manager-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>