Merge pull request #120 from gnodet/issue-118

Rename ServerMain to MavenDaemon to be more explicit, fixes #118
apache · Oct 21, 2020 · 68b14f0 · 68b14f0
2 parents 4f186f3 + 020c4ef
commit 68b14f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java
@@ -48,7 +48,7 @@
 import org.jboss.fuse.mvnd.common.Environment;
 import org.jboss.fuse.mvnd.common.Message;
 import org.jboss.fuse.mvnd.common.Serializer;
-import org.jboss.fuse.mvnd.common.ServerMain;
+import org.jboss.fuse.mvnd.common.MavenDaemon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -279,7 +279,7 @@ private String startDaemon() {
                 args.add(Environment.DAEMON_IDLE_TIMEOUT.asCommandLineProperty(timeout));
             }
 
-            args.add(ServerMain.class.getName());
+            args.add(MavenDaemon.class.getName());
             command = String.join(" ", args);
 
             LOGGER.debug("Starting daemon process: uid = {}, workingDir = {}, daemonArgs: {}", uid, workingDir, command);

diff --git a/...rg/jboss/fuse/mvnd/common/ServerMain.java → ...g/jboss/fuse/mvnd/common/MavenDaemon.java b/...rg/jboss/fuse/mvnd/common/ServerMain.java → ...g/jboss/fuse/mvnd/common/MavenDaemon.java
@@ -23,7 +23,7 @@
 import java.nio.file.Path;
 import java.util.stream.Stream;
 
-public class ServerMain {
+public class MavenDaemon {
 
     public static void main(String[] args) throws Exception {
         // Disable URL caching so that  the JVM does not try to cache resources
@@ -64,7 +64,7 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
                 try {
                     return super.findClass(name);
                 } catch (ClassNotFoundException e) {
-                    return ServerMain.class.getClassLoader().loadClass(name);
+                    return MavenDaemon.class.getClassLoader().loadClass(name);
                 }
             }
         };