You are viewing a plain text version of this content. The canonical link for it is here.
Posted to submarine-dev@hadoop.apache.org by zh...@apache.org on 2019/10/18 12:03:20 UTC
[hadoop-submarine] branch master updated: SUBMARINE-249. Submarine
commons utils module
This is an automated email from the ASF dual-hosted git repository.
zhouquan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 28303ef SUBMARINE-249. Submarine commons utils module
28303ef is described below
commit 28303effe989397587978cde49f3c12ae7a10704
Author: Xun Liu <li...@apache.org>
AuthorDate: Fri Oct 18 18:43:44 2019 +0800
SUBMARINE-249. Submarine commons utils module
### What is this PR for?
There are some shared classes in the submarine system, such as submarine-configure, network utils. This module can be reused.
### What type of PR is it?
[Refactoring]
### What is the Jira issue?
* https://issues.apache.org/jira/browse/SUBMARINE-249
### How should this be tested?
* [CI Pass](https://travis-ci.org/liuxunorg/hadoop-submarine/builds/599583779)
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Xun Liu <li...@apache.org>
Closes #54 from liuxunorg/SUBMARINE-249 and squashes the following commits:
c02bcc0 [Xun Liu] SUBMARINE-249. Submarine commons utils module
---
submarine-commons/{ => commons-utils}/pom.xml | 34 +++++++++++++++++-----
.../commons/utils}/SubmarineConfiguration.java | 2 +-
submarine-commons/pom.xml | 1 +
submarine-workbench/workbench-server/pom.xml | 6 ++++
.../org/apache/submarine/database/MyBatisUtil.java | 2 +-
.../apache/submarine/server/WorkbenchServer.java | 3 +-
6 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/submarine-commons/pom.xml b/submarine-commons/commons-utils/pom.xml
similarity index 59%
copy from submarine-commons/pom.xml
copy to submarine-commons/commons-utils/pom.xml
index f94455d..a458c7a 100644
--- a/submarine-commons/pom.xml
+++ b/submarine-commons/commons-utils/pom.xml
@@ -22,19 +22,39 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>submarine</artifactId>
+ <artifactId>submarine-commons</artifactId>
<groupId>org.apache.submarine</groupId>
<version>0.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>submarine-commons</artifactId>
+ <artifactId>commons-utils</artifactId>
<version>0.3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Submarine: Commons</name>
+ <name>Submarine: Commons Utils</name>
- <modules>
- <module>commons-runtime</module>
- </modules>
+ <dependencies>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons-configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/SubmarineConfiguration.java b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfiguration.java
similarity index 99%
rename from submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/SubmarineConfiguration.java
rename to submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfiguration.java
index 135f697..8ae958e 100644
--- a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/SubmarineConfiguration.java
+++ b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfiguration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server;
+package org.apache.submarine.commons.utils;
import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.configuration.ConfigurationException;
diff --git a/submarine-commons/pom.xml b/submarine-commons/pom.xml
index f94455d..68fc35c 100644
--- a/submarine-commons/pom.xml
+++ b/submarine-commons/pom.xml
@@ -34,6 +34,7 @@
<name>Submarine: Commons</name>
<modules>
+ <module>commons-utils</module>
<module>commons-runtime</module>
</modules>
diff --git a/submarine-workbench/workbench-server/pom.xml b/submarine-workbench/workbench-server/pom.xml
index 3e0012d..8db9182 100644
--- a/submarine-workbench/workbench-server/pom.xml
+++ b/submarine-workbench/workbench-server/pom.xml
@@ -36,6 +36,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.submarine</groupId>
+ <artifactId>commons-utils</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
diff --git a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java
index 35a712c..40ac9a8 100755
--- a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java
+++ b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/MyBatisUtil.java
@@ -22,7 +22,7 @@ import org.apache.ibatis.io.Resources;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.apache.submarine.server.SubmarineConfiguration;
+import org.apache.submarine.commons.utils.SubmarineConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchServer.java b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchServer.java
index 4db68f3..72d3ce1 100644
--- a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchServer.java
+++ b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/server/WorkbenchServer.java
@@ -38,7 +38,8 @@ import org.glassfish.jersey.server.ResourceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.submarine.server.SubmarineConfiguration.ConfVars;
+import org.apache.submarine.commons.utils.SubmarineConfiguration;
+import org.apache.submarine.commons.utils.SubmarineConfiguration.ConfVars;
import javax.inject.Inject;
import java.io.File;