This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 08916d4 [INLONG-676] modify manager-web to manager-api in
inlong-manager module (#521)
08916d4 is described below
commit 08916d48ce9e26b197bbb82b94fed5843b310fdf
Author: healchow <[email protected]>
AuthorDate: Thu Jul 8 18:48:59 2021 +0800
[INLONG-676] modify manager-web to manager-api in inlong-manager module
(#521)
Co-authored-by: healzhou <[email protected]>
---
.../{manager-web => manager-api}/assembly.xml | 12 +-
.../{manager-web => manager-api}/bin/restart.sh | 2 +-
.../{manager-web => manager-api}/bin/shutdown.sh | 4 +-
.../{manager-web => manager-api}/bin/startup.sh | 10 +-
.../{manager-web => manager-api}/pom.xml | 8 +-
.../inlong/manager/web/InLongApiApplication.java} | 4 +-
.../inlong/manager/web/aspect/LogAspect.java | 0
.../manager/web/auth/AuthenticationFilter.java | 0
.../inlong/manager/web/auth/ShiroConfig.java | 0
.../manager/web/auth/WebAuthorizingRealm.java | 0
.../web/config/ControllerExceptionHanlder.java | 0
.../manager/web/config/RestTemplateConfig.java | 0
.../inlong/manager/web/config/Swagger2Config.java | 0
.../manager/web/controller/AnnoController.java | 0
.../web/controller/BasicInfoController.java | 0
.../manager/web/controller/BusinessController.java | 0
.../manager/web/controller/ClusterController.java | 0
.../web/controller/CommonDBServerController.java | 0
.../web/controller/CommonFileServerController.java | 0
.../web/controller/ConsumptionController.java | 0
.../web/controller/DataStreamController.java | 0
.../manager/web/controller/SourceDbController.java | 0
.../web/controller/SourceFileController.java | 0
.../manager/web/controller/StorageController.java | 0
.../web/controller/ThirdPartController.java | 0
.../manager/web/controller/UserController.java | 0
.../web/controller/WorkflowApproverController.java | 0
.../manager/web/controller/WorkflowController.java | 0
.../web/controller/WorkflowEventController.java | 0
.../src/main/resources/application-dev.yml | 0
.../src/main/resources/application-prod.yml | 0
.../src/main/resources/application-test.yml | 0
.../src/main/resources/application.yml | 2 +-
.../main/resources/common_db_server_template.csv | 0
.../main/resources/common_file_server_template.csv | 0
.../src/main/resources/logback-spring.xml | 2 +-
.../org/apache/inlong/manager/web/UtilsTest.java | 0
.../inlong/manager/web/WebApplicationTests.java | 0
inlong-manager/manager-dao/pom.xml | 38 +---
inlong-manager/manager-openapi/assembly.xml | 12 +-
inlong-manager/manager-openapi/bin/restart.sh | 2 +-
inlong-manager/manager-openapi/bin/shutdown.sh | 2 +-
inlong-manager/manager-openapi/bin/startup.sh | 6 +-
.../src/main/resources/application.yml | 2 +-
inlong-manager/manager-service/pom.xml | 227 ++-------------------
.../service/core/impl/HiveSourceServiceImpl.java | 2 +-
inlong-manager/pom.xml | 15 +-
47 files changed, 67 insertions(+), 283 deletions(-)
diff --git a/inlong-manager/manager-web/assembly.xml
b/inlong-manager/manager-api/assembly.xml
similarity index 86%
rename from inlong-manager/manager-web/assembly.xml
rename to inlong-manager/manager-api/assembly.xml
index 681cb9e..a9c1dcd 100755
--- a/inlong-manager/manager-web/assembly.xml
+++ b/inlong-manager/manager-api/assembly.xml
@@ -25,7 +25,7 @@
<format>dir</format>
</formats>
-
<baseDirectory>apache-inlong-${project.artifactId}-${project.version}-bin</baseDirectory>
+ <baseDirectory>${project.artifactId}</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
@@ -63,16 +63,6 @@
<include>${project.build.finalName}.jar</include>
</includes>
</fileSet>
-
- <!-- Contains files in the root directory -->
- <fileSet>
- <directory>${basedir}</directory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>*.md</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
diff --git a/inlong-manager/manager-web/bin/restart.sh
b/inlong-manager/manager-api/bin/restart.sh
similarity index 95%
rename from inlong-manager/manager-web/bin/restart.sh
rename to inlong-manager/manager-api/bin/restart.sh
index b16c977..4fbb12f 100755
--- a/inlong-manager/manager-web/bin/restart.sh
+++ b/inlong-manager/manager-api/bin/restart.sh
@@ -25,7 +25,7 @@
#======================================================================
# Project name
-APPLICATION="inlong-manager-openapi"
+APPLICATION="InLong-Manager-API"
BIN_PATH=$(cd $(dirname $0); pwd)
echo "restart in " ${BIN_PATH}
diff --git a/inlong-manager/manager-web/bin/shutdown.sh
b/inlong-manager/manager-api/bin/shutdown.sh
similarity index 95%
rename from inlong-manager/manager-web/bin/shutdown.sh
rename to inlong-manager/manager-api/bin/shutdown.sh
index 6850610..1483ef9 100755
--- a/inlong-manager/manager-web/bin/shutdown.sh
+++ b/inlong-manager/manager-api/bin/shutdown.sh
@@ -25,10 +25,10 @@
#======================================================================
# Project name
-APPLICATION="inlong-manager-web"
+APPLICATION="InLong-Manager-API"
# Project startup jar package name
-APPLICATION_JAR="manager-web.jar"
+APPLICATION_JAR="manager-api.jar"
PID=$(ps -ef | grep "${APPLICATION_JAR}" | grep -v grep | awk '{ print $2 }')
if [[ -z "$PID" ]]
diff --git a/inlong-manager/manager-web/bin/startup.sh
b/inlong-manager/manager-api/bin/startup.sh
similarity index 93%
rename from inlong-manager/manager-web/bin/startup.sh
rename to inlong-manager/manager-api/bin/startup.sh
index 5ac960f..f83b92e 100755
--- a/inlong-manager/manager-web/bin/startup.sh
+++ b/inlong-manager/manager-api/bin/startup.sh
@@ -28,10 +28,10 @@
#======================================================================
# Project name
-APPLICATION="inlong-manager-web"
+APPLICATION="InLong-Manager-API"
# Project startup jar package name
-APPLICATION_JAR="manager-web.jar"
+APPLICATION_JAR="manager-api.jar"
JAVA_HOME=
export PATH=$PATH:$JAVA_HOME/bin
@@ -52,11 +52,11 @@ CONFIG_DIR=${BASE_PATH}"/conf/"
JAR_LIBS=${BASE_PATH}"/lib/*"
JAR_MAIN=${BASE_PATH}"/lib/"${APPLICATION_JAR}
CLASSPATH=${CONFIG_DIR}:${JAR_LIBS}:${JAR_MAIN}
-MAIN_CLASS=org.apache.inlong.manager.web.InLongWebApplication
+MAIN_CLASS=org.apache.inlong.manager.web.InLongApiApplication
# Project log output absolute path
LOG_DIR=${BASE_PATH}"/log"
-LOG_FILE="${LOG_DIR}/${APPLICATION}_sout.log"
+LOG_FILE="${LOG_DIR}/sout-manager-api.log"
# Log backup directory
LOG_BACK_DIR="${LOG_DIR}/back/"
@@ -92,7 +92,7 @@ echo "" >${LOG_FILE}
JAVA_OPT="-server -Xms4g -Xmx4g -XX:MetaspaceSize=256m
-XX:MaxMetaspaceSize=512m -XX:-OmitStackTraceInFastThrow "
#gc options
-JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseParNewGC
-XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:${LOG_DIR}/gc.log"
+JAVA_OPT="${JAVA_OPT} -XX:+IgnoreUnrecognizedVMOptions -XX:+UseConcMarkSweepGC
-XX:+UseParNewGC -XX:+PrintGCDetails -XX:+PrintGCDateStamps
-Xloggc:${LOG_DIR}/gc.log"
#jmx metrics
#JAVA_OPT="${JAVA_OPT} -Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.port=8011
-Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false"
diff --git a/inlong-manager/manager-web/pom.xml
b/inlong-manager/manager-api/pom.xml
similarity index 98%
rename from inlong-manager/manager-web/pom.xml
rename to inlong-manager/manager-api/pom.xml
index a2b7a34..8e0f2e3 100644
--- a/inlong-manager/manager-web/pom.xml
+++ b/inlong-manager/manager-api/pom.xml
@@ -26,7 +26,7 @@
<version>0.9.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>manager-web</artifactId>
+ <artifactId>manager-api</artifactId>
<name>Apache InLong - Manager Web</name>
<dependencies>
@@ -146,7 +146,7 @@
</dependencies>
<build>
- <finalName>manager-web</finalName>
+ <finalName>manager-api</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -181,7 +181,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.0</version>
<executions>
<execution>
<phase>prepare-package</phase>
@@ -198,6 +197,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -221,14 +221,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<executions>
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/InLongWebApplication.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/InLongApiApplication.java
similarity index 93%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/InLongWebApplication.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/InLongApiApplication.java
index df71aba..5a35cac 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/InLongWebApplication.java
+++
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/InLongApiApplication.java
@@ -27,11 +27,11 @@ import
org.springframework.scheduling.annotation.EnableScheduling;
@EnableConfigurationProperties
@EnableScheduling
@ComponentScan(basePackages = "org.apache.inlong.manager")
-public class InLongWebApplication {
+public class InLongApiApplication {
public static void main(String[] args) {
System.setProperty("spring.devtools.restart.enabled", "false");
- SpringApplication.run(InLongWebApplication.class, args);
+ SpringApplication.run(InLongApiApplication.class, args);
}
}
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/aspect/LogAspect.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/aspect/LogAspect.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/aspect/LogAspect.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/aspect/LogAspect.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/AuthenticationFilter.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/auth/AuthenticationFilter.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/AuthenticationFilter.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/auth/AuthenticationFilter.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/ShiroConfig.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/auth/ShiroConfig.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/ShiroConfig.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/auth/ShiroConfig.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/WebAuthorizingRealm.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/auth/WebAuthorizingRealm.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/WebAuthorizingRealm.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/auth/WebAuthorizingRealm.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHanlder.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHanlder.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHanlder.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHanlder.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/RestTemplateConfig.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/config/RestTemplateConfig.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/RestTemplateConfig.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/config/RestTemplateConfig.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/Swagger2Config.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/config/Swagger2Config.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/Swagger2Config.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/config/Swagger2Config.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AnnoController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/AnnoController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AnnoController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/AnnoController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/BasicInfoController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BusinessController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/BusinessController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/BusinessController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/BusinessController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ClusterController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/ClusterController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ClusterController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/ClusterController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataStreamController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/DataStreamController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataStreamController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/DataStreamController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/SourceDbController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/SourceDbController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/SourceDbController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/SourceDbController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/SourceFileController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/SourceFileController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/SourceFileController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/SourceFileController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StorageController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/StorageController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StorageController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/StorageController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ThirdPartController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/ThirdPartController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ThirdPartController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/ThirdPartController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/UserController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/UserController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/UserController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/UserController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowApproverController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/WorkflowApproverController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowApproverController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/WorkflowApproverController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
b/inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
similarity index 100%
rename from
inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
rename to
inlong-manager/manager-api/src/main/java/org/apache/inlong/manager/web/controller/WorkflowEventController.java
diff --git a/inlong-manager/manager-web/src/main/resources/application-dev.yml
b/inlong-manager/manager-api/src/main/resources/application-dev.yml
similarity index 100%
rename from inlong-manager/manager-web/src/main/resources/application-dev.yml
rename to inlong-manager/manager-api/src/main/resources/application-dev.yml
diff --git a/inlong-manager/manager-web/src/main/resources/application-prod.yml
b/inlong-manager/manager-api/src/main/resources/application-prod.yml
similarity index 100%
rename from inlong-manager/manager-web/src/main/resources/application-prod.yml
rename to inlong-manager/manager-api/src/main/resources/application-prod.yml
diff --git a/inlong-manager/manager-web/src/main/resources/application-test.yml
b/inlong-manager/manager-api/src/main/resources/application-test.yml
similarity index 100%
rename from inlong-manager/manager-web/src/main/resources/application-test.yml
rename to inlong-manager/manager-api/src/main/resources/application-test.yml
diff --git a/inlong-manager/manager-web/src/main/resources/application.yml
b/inlong-manager/manager-api/src/main/resources/application.yml
similarity index 98%
rename from inlong-manager/manager-web/src/main/resources/application.yml
rename to inlong-manager/manager-api/src/main/resources/application.yml
index 849573b..1fe5b20 100644
--- a/inlong-manager/manager-web/src/main/resources/application.yml
+++ b/inlong-manager/manager-api/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
spring:
application:
- name: inLong-manager-web
+ name: InLong-Manager-API
profiles:
active: dev
diff --git
a/inlong-manager/manager-web/src/main/resources/common_db_server_template.csv
b/inlong-manager/manager-api/src/main/resources/common_db_server_template.csv
similarity index 100%
rename from
inlong-manager/manager-web/src/main/resources/common_db_server_template.csv
rename to
inlong-manager/manager-api/src/main/resources/common_db_server_template.csv
diff --git
a/inlong-manager/manager-web/src/main/resources/common_file_server_template.csv
b/inlong-manager/manager-api/src/main/resources/common_file_server_template.csv
similarity index 100%
rename from
inlong-manager/manager-web/src/main/resources/common_file_server_template.csv
rename to
inlong-manager/manager-api/src/main/resources/common_file_server_template.csv
diff --git a/inlong-manager/manager-web/src/main/resources/logback-spring.xml
b/inlong-manager/manager-api/src/main/resources/logback-spring.xml
similarity index 99%
rename from inlong-manager/manager-web/src/main/resources/logback-spring.xml
rename to inlong-manager/manager-api/src/main/resources/logback-spring.xml
index f5c68a1..d472d59 100644
--- a/inlong-manager/manager-web/src/main/resources/logback-spring.xml
+++ b/inlong-manager/manager-api/src/main/resources/logback-spring.xml
@@ -46,7 +46,7 @@
<!--Application log, time rolling output -->
<appender name="APP_LOG_FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- The path and file name of the log file being recorded -->
- <file>${log.path}/manager-web.log</file>
+ <file>${log.path}/manager-api.log</file>
<!--Log file output format-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level
%logger{50}:%L - %msg%n</pattern>
diff --git
a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/UtilsTest.java
b/inlong-manager/manager-api/src/test/java/org/apache/inlong/manager/web/UtilsTest.java
similarity index 100%
rename from
inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/UtilsTest.java
rename to
inlong-manager/manager-api/src/test/java/org/apache/inlong/manager/web/UtilsTest.java
diff --git
a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/WebApplicationTests.java
b/inlong-manager/manager-api/src/test/java/org/apache/inlong/manager/web/WebApplicationTests.java
similarity index 100%
rename from
inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/WebApplicationTests.java
rename to
inlong-manager/manager-api/src/test/java/org/apache/inlong/manager/web/WebApplicationTests.java
diff --git a/inlong-manager/manager-dao/pom.xml
b/inlong-manager/manager-dao/pom.xml
index 514d7f0..868c186 100644
--- a/inlong-manager/manager-dao/pom.xml
+++ b/inlong-manager/manager-dao/pom.xml
@@ -76,36 +76,18 @@
<artifactId>hive-jdbc</artifactId>
<exclusions>
<exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>HikariCP</artifactId>
- <groupId>com.zaxxer</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-api</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-slf4j-impl</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-1.2-api</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ <exclusions>
<exclusion>
- <artifactId>log4j-core</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/inlong-manager/manager-openapi/assembly.xml
b/inlong-manager/manager-openapi/assembly.xml
index 681cb9e..a9c1dcd 100755
--- a/inlong-manager/manager-openapi/assembly.xml
+++ b/inlong-manager/manager-openapi/assembly.xml
@@ -25,7 +25,7 @@
<format>dir</format>
</formats>
-
<baseDirectory>apache-inlong-${project.artifactId}-${project.version}-bin</baseDirectory>
+ <baseDirectory>${project.artifactId}</baseDirectory>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
@@ -63,16 +63,6 @@
<include>${project.build.finalName}.jar</include>
</includes>
</fileSet>
-
- <!-- Contains files in the root directory -->
- <fileSet>
- <directory>${basedir}</directory>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- <include>*.md</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
diff --git a/inlong-manager/manager-openapi/bin/restart.sh
b/inlong-manager/manager-openapi/bin/restart.sh
index b16c977..02b690c 100755
--- a/inlong-manager/manager-openapi/bin/restart.sh
+++ b/inlong-manager/manager-openapi/bin/restart.sh
@@ -25,7 +25,7 @@
#======================================================================
# Project name
-APPLICATION="inlong-manager-openapi"
+APPLICATION="InLong-Manager-OpenAPI"
BIN_PATH=$(cd $(dirname $0); pwd)
echo "restart in " ${BIN_PATH}
diff --git a/inlong-manager/manager-openapi/bin/shutdown.sh
b/inlong-manager/manager-openapi/bin/shutdown.sh
index 6f1463b..44d33fd 100755
--- a/inlong-manager/manager-openapi/bin/shutdown.sh
+++ b/inlong-manager/manager-openapi/bin/shutdown.sh
@@ -25,7 +25,7 @@
#======================================================================
# Project name
-APPLICATION="inlong-manager-openapi"
+APPLICATION="InLong-Manager-OpenAPI"
# Project startup jar package name
APPLICATION_JAR="manager-openapi.jar"
diff --git a/inlong-manager/manager-openapi/bin/startup.sh
b/inlong-manager/manager-openapi/bin/startup.sh
index 25ffb5d..6b9ce5e 100755
--- a/inlong-manager/manager-openapi/bin/startup.sh
+++ b/inlong-manager/manager-openapi/bin/startup.sh
@@ -28,7 +28,7 @@
#======================================================================
# Project name
-APPLICATION="inlong-manager-openapi"
+APPLICATION="InLong-Manager-OpenAPI"
# Project startup jar package name
APPLICATION_JAR="manager-openapi.jar"
@@ -56,7 +56,7 @@
MAIN_CLASS=org.apache.inlong.manager.openapi.InLongOpenApiApplication
# Project log output absolute path
LOG_DIR=${BASE_PATH}"/log"
-LOG_FILE="${LOG_DIR}/${APPLICATION}_sout.log"
+LOG_FILE="${LOG_DIR}/sout-manager-openapi.log"
# Log backup directory
LOG_BACK_DIR="${LOG_DIR}/back/"
@@ -92,7 +92,7 @@ echo "" >${LOG_FILE}
JAVA_OPT="-server -Xms2g -Xmx2g -XX:MetaspaceSize=128m
-XX:MaxMetaspaceSize=256m -XX:-OmitStackTraceInFastThrow "
#gc options
-JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseParNewGC
-XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:${LOG_DIR}/gc.log"
+JAVA_OPT="${JAVA_OPT} -XX:+IgnoreUnrecognizedVMOptions -XX:+UseConcMarkSweepGC
-XX:+UseParNewGC -XX:+PrintGCDetails -XX:+PrintGCDateStamps
-Xloggc:${LOG_DIR}/gc.log"
#jmx metrics
#JAVA_OPT="${JAVA_OPT} -Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.port=8011
-Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false"
diff --git a/inlong-manager/manager-openapi/src/main/resources/application.yml
b/inlong-manager/manager-openapi/src/main/resources/application.yml
index 76d31a2..dac9657 100644
--- a/inlong-manager/manager-openapi/src/main/resources/application.yml
+++ b/inlong-manager/manager-openapi/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
spring:
application:
- name: inLong-manager-openapi
+ name: InLong-Manager-OpenAPI
profiles:
active: dev
diff --git a/inlong-manager/manager-service/pom.xml
b/inlong-manager/manager-service/pom.xml
index 8c2733d..27fda75 100644
--- a/inlong-manager/manager-service/pom.xml
+++ b/inlong-manager/manager-service/pom.xml
@@ -59,52 +59,17 @@
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
<exclusions>
<exclusion>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>avro</artifactId>
- <groupId>org.apache.avro</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hive-metastore</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsr305</artifactId>
- <groupId>com.google.code.findbugs</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-xc</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-jaxrs</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -113,88 +78,18 @@
<artifactId>hive-metastore</artifactId>
<exclusions>
<exclusion>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>HikariCP</artifactId>
- <groupId>com.zaxxer</groupId>
- </exclusion>
- <exclusion>
- <artifactId>zookeeper</artifactId>
- <groupId>org.apache.zookeeper</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-api</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- <exclusion>
- <artifactId>curator-client</artifactId>
- <groupId>org.apache.curator</groupId>
- </exclusion>
- <exclusion>
- <artifactId>curator-framework</artifactId>
- <groupId>org.apache.curator</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hadoop-auth</artifactId>
- <groupId>org.apache.hadoop</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hadoop-common</artifactId>
- <groupId>org.apache.hadoop</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hive-serde</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hive-shims</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-core-asl</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jline</artifactId>
- <groupId>jline</groupId>
- </exclusion>
- <exclusion>
- <artifactId>metrics-core</artifactId>
- <groupId>io.dropwizard.metrics</groupId>
- </exclusion>
- <exclusion>
- <artifactId>libthrift</artifactId>
- <groupId>org.apache.thrift</groupId>
- </exclusion>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsr305</artifactId>
- <groupId>com.google.code.findbugs</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jcodings</artifactId>
- <groupId>org.jruby.jcodings</groupId>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-standalone-metastore</artifactId>
+ <exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -203,44 +98,8 @@
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>guava</artifactId>
- <groupId>com.google.guava</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-core-asl</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-mapper-asl</artifactId>
- <groupId>org.codehaus.jackson</groupId>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -249,52 +108,8 @@
<artifactId>hive-service</artifactId>
<exclusions>
<exclusion>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>antlr-runtime</artifactId>
- <groupId>org.antlr</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-httpclient</artifactId>
- <groupId>commons-httpclient</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-lang</artifactId>
- <groupId>commons-lang</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- <exclusion>
- <artifactId>datanucleus-core</artifactId>
- <groupId>org.datanucleus</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hive-metastore</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jline</artifactId>
- <groupId>jline</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>libfb303</artifactId>
- <groupId>org.apache.thrift</groupId>
- </exclusion>
- <exclusion>
- <artifactId>pentaho-aggdesigner-algorithm</artifactId>
- <groupId>org.pentaho</groupId>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/HiveSourceServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/HiveSourceServiceImpl.java
index 077e8b2..d87e6f9 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/HiveSourceServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/HiveSourceServiceImpl.java
@@ -20,7 +20,7 @@ package org.apache.inlong.manager.service.core.impl;
import java.sql.Connection;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.enums.BizErrorCodeEnum;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.query.ColumnInfoBean;
diff --git a/inlong-manager/pom.xml b/inlong-manager/pom.xml
index 49bc42e..b93404a 100644
--- a/inlong-manager/pom.xml
+++ b/inlong-manager/pom.xml
@@ -34,7 +34,7 @@
<module>manager-workflow-engine</module>
<module>manager-dao</module>
<module>manager-service</module>
- <module>manager-web</module>
+ <module>manager-api</module>
<module>manager-openapi</module>
</modules>
@@ -237,12 +237,21 @@
<artifactId>hive-jdbc</artifactId>
<version>${hive.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-common</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
<version>${hive.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-standalone-metastore</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -265,7 +274,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>3.11</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
