Fix #2 Add completion

Author: ngocdaothanh

build.sbt

@@ -20,6 +20,6 @@ libraryDependencies += "jline"          % "jline"          % "2.14.2"
 unmanagedJars in Compile := (file(System.getProperty("java.home")) / ".." / "lib" * "tools.jar").classpath
 
 packageOptions in (Compile, packageBin) += Package.ManifestAttributes(
-  "Main-Class"  -> "scalive.AgentLoader",
-  "Agent-Class" -> "scalive.Agent"
+  "Main-Class"  -> "scalive.client.AgentLoader",
+  "Agent-Class" -> "scalive.server.Agent"
 )

dev/zip/scalive

@@ -15,4 +15,4 @@ CLASS_PATH="$ROOT_DIR/*:."
 
 # Use exec to be compatible with daemontools:
 # http://cr.yp.to/daemontools.html
-exec java $JAVA_OPTS -cp $CLASS_PATH scalive.AgentLoader $ROOT_DIR $@
+exec java $JAVA_OPTS -cp $CLASS_PATH scalive.client.AgentLoader $ROOT_DIR $@

dev/zip/scalive.cmd

@@ -7,4 +7,4 @@ cd "%ROOT_DIR%"
 
 set CLASS_PATH="%ROOT_DIR%\*;."
 
-java %JAVA_OPTS% -cp %CLASS_PATH% scalive.AgentLoader %ROOT_DIR% %*
+java %JAVA_OPTS% -cp %CLASS_PATH% scalive.client.AgentLoader %ROOT_DIR% %*

src/main/java/scalive/Classpath.java

@@ -1,23 +1,24 @@
 package scalive;
 
 import java.io.File;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
 
 public class Classpath {
-    private static Method addURL = getAddURL();
+    private static final Method addURL = getAddURL();
 
     // http://stackoverflow.com/questions/8222976/why-urlclassloader-addurl-protected-in-java
     private static Method getAddURL() {
         try {
             Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
             method.setAccessible(true);
             return method;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -30,7 +31,7 @@ private static Method getAddURL() {
      *
      * @param jarPrefix JAR file name prefix to search; example: "scalive-agent" will match "scalive-agent-xxx.jar"
      */
-    public static String findJar(String[] jarSearchDirs, String jarPrefix) throws Exception {
+    public static String findJar(String[] jarSearchDirs, String jarPrefix) throws IllegalStateException {
         String maxBaseName = null;
         File   maxFile     = null;
         for (String jarSearchDir: jarSearchDirs) {
@@ -50,22 +51,26 @@ public static String findJar(String[] jarSearchDirs, String jarPrefix) throws Ex
         }
 
         if (maxFile == null)
-            throw new Exception("Could not find " + jarPrefix + " in " + join(jarSearchDirs, File.pathSeparator));
+            throw new IllegalStateException("Could not find " + jarPrefix + " in " + join(jarSearchDirs, File.pathSeparator));
         else
             return maxFile.getPath();
     }
 
-    public static void addPath(URLClassLoader cl, String path) throws Exception {
+    public static void addPath(
+            URLClassLoader cl, String path
+    ) throws MalformedURLException, InvocationTargetException, IllegalAccessException {
         URL   url  = new File(path).toURI().toURL();
         URL[] urls = cl.getURLs();
         if (!Arrays.asList(urls).contains(url)) addURL.invoke(cl, url);
     }
 
     /** Combination of {@link #findJar(String[], String)} and {@link #addPath(URLClassLoader, String)}. */
-    public static void findAndAddJar(URLClassLoader cl, String[] jarSearchDirs, String jarPrefix) throws Exception {
+    public static void findAndAddJar(
+            URLClassLoader cl, String[] jarSearchDirs, String jarPrefix
+    ) throws IllegalAccessException, InvocationTargetException, MalformedURLException {
         String jar = findJar(jarSearchDirs, jarPrefix);
         addPath(cl, jar);
-        System.out.println("[Scalive] Load " + jar);
+        Log.log("Load " + jar);
     }
 
     /**
@@ -74,7 +79,7 @@ public static void findAndAddJar(URLClassLoader cl, String[] jarSearchDirs, Stri
      */
     public static void findAndAddJar(
         URLClassLoader cl, String representativeClass, String[] jarSearchDirs, String jarPrefix
-    ) throws Exception {
+    ) throws IllegalAccessException, MalformedURLException, InvocationTargetException {
         try {
             Class.forName(representativeClass, true, cl);
         } catch (ClassNotFoundException e) {
@@ -88,7 +93,9 @@ public static String getClasspath(URLClassLoader cl) {
         return join(urls, File.pathSeparator);
     }
 
-    public static String getScalaVersion(ClassLoader cl) throws Exception {
+    public static String getScalaVersion(
+            ClassLoader cl
+    ) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         Class<?> k = Class.forName("scala.util.Properties", true, cl);
         Method   m = k.getDeclaredMethod("versionNumberString");
         return (String) m.invoke(k);

src/main/java/scalive/Client.java

@@ -0,0 +1,11 @@
+package scalive;
+
+public class Log {
+    public static void log(String msg) {
+        System.out.println("[Scalive] " + msg);
+    }
+
+    public static void logNoTag(String msg) {
+        System.out.println(msg);
+    }
+}

src/main/java/scalive/Log.java

@@ -0,0 +1,24 @@
+package scalive;
+
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.UnknownHostException;
+
+public class Net {
+    public static final InetAddress LOCALHOST = getLocalHostAddress();
+
+    public static int getLocalFreePort() throws Exception {
+        ServerSocket server = new ServerSocket(0, 0, Net.LOCALHOST);
+        int          port   = server.getLocalPort();
+        server.close();
+        return port;
+    }
+
+    private static InetAddress getLocalHostAddress() {
+        try {
+            return InetAddress.getByAddress(new byte[] {127, 0, 0, 1});
+        } catch (UnknownHostException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}