This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 f80db6da3 [INLONG-3701][Manager] Decrease the size of manager client
tools (#3702)
f80db6da3 is described below
commit f80db6da383706b65b440be8dc525109bf36f9a6
Author: dockerzhang <[email protected]>
AuthorDate: Thu Apr 14 18:41:11 2022 +0800
[INLONG-3701][Manager] Decrease the size of manager client tools (#3702)
---
inlong-manager/manager-client-tools/pom.xml | 40 ----------------------
...InlongCommandTool.java => CommandToolMain.java} | 6 ++--
.../inlong/manager/client/cli/TestCommand.java | 2 +-
inlong-manager/manager-web/bin/managerctl | 9 ++---
4 files changed, 9 insertions(+), 48 deletions(-)
diff --git a/inlong-manager/manager-client-tools/pom.xml
b/inlong-manager/manager-client-tools/pom.xml
index c2d036a5d..86c0eef52 100644
--- a/inlong-manager/manager-client-tools/pom.xml
+++ b/inlong-manager/manager-client-tools/pom.xml
@@ -49,44 +49,4 @@
</dependency>
</dependencies>
- <build>
- <finalName>manager-client-tools</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
-
- <transformers>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-
<mainClass>org.apache.inlong.manager.client.cli.InlongCommandTool</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/InlongCommandTool.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CommandToolMain.java
similarity index 95%
rename from
inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/InlongCommandTool.java
rename to
inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CommandToolMain.java
index 4790aa9c5..cae51b80b 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/InlongCommandTool.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CommandToolMain.java
@@ -25,7 +25,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-public class InlongCommandTool {
+public class CommandToolMain {
protected final Map<String, Class<?>> commandMap = new HashMap<>();
private final JCommander jcommander;
@@ -33,7 +33,7 @@ public class InlongCommandTool {
@Parameter(names = {"-h", "--help"}, help = true, description = "Get all
command about managerctl.")
boolean help;
- InlongCommandTool() {
+ CommandToolMain() {
jcommander = new JCommander();
jcommander.setProgramName("managerctl");
jcommander.addObject(this);
@@ -58,7 +58,7 @@ public class InlongCommandTool {
}
public static void main(String[] args) {
- InlongCommandTool inlongAdminTool = new InlongCommandTool();
+ CommandToolMain inlongAdminTool = new CommandToolMain();
if (inlongAdminTool.run(args)) {
System.exit(0);
} else {
diff --git
a/inlong-manager/manager-client-tools/src/test/java/org/apache/inlong/manager/client/cli/TestCommand.java
b/inlong-manager/manager-client-tools/src/test/java/org/apache/inlong/manager/client/cli/TestCommand.java
index 9ec0d4447..d079672be 100644
---
a/inlong-manager/manager-client-tools/src/test/java/org/apache/inlong/manager/client/cli/TestCommand.java
+++
b/inlong-manager/manager-client-tools/src/test/java/org/apache/inlong/manager/client/cli/TestCommand.java
@@ -23,7 +23,7 @@ import org.junit.Test;
@Slf4j
public class TestCommand {
- InlongCommandTool inlongAdminTool = new InlongCommandTool();
+ CommandToolMain inlongAdminTool = new CommandToolMain();
@Test
public void testListGroup() {
diff --git a/inlong-manager/manager-web/bin/managerctl
b/inlong-manager/manager-web/bin/managerctl
index 1049ff7aa..b63edd031 100644
--- a/inlong-manager/manager-web/bin/managerctl
+++ b/inlong-manager/manager-web/bin/managerctl
@@ -20,8 +20,6 @@
# Project startup jar package name
-APPLICATION_JAR="manager-client-tools-*.jar"
-
BIN_PATH=$(
cd $(dirname $0)
pwd
@@ -32,6 +30,9 @@ cd ../
BASE_PATH=$(pwd)
-JAR_MAIN=${BASE_PATH}"/lib/"${APPLICATION_JAR}
+CONFIG_DIR=${BASE_PATH}"/conf/"
+JAR_LIBS=${BASE_PATH}"/lib/*"
+CLASSPATH=${CONFIG_DIR}:${JAR_LIBS}
+MAIN_CLASS="org.apache.inlong.manager.client.cli.CommandToolMain"
-java -jar ${JAR_MAIN} $*;
\ No newline at end of file
+java ${JAVA_OPT} -cp ${CLASSPATH} ${MAIN_CLASS} $*
\ No newline at end of file
