fix directory properties. create the ability to designate the server jar

Author: Myron Scott

default-configuration/src/main/java/org/terracotta/config/provider/DefaultConfigurationProvider.java

@@ -224,7 +224,7 @@ private Path getConfiguration(String[] args) throws Exception {
       return defaultUserHomeConfigurationPath;
     }
 
-    return Directories.getDefaultConfigFile();
+    return Directories.getInstallationRoot().resolve("conf/tc-config.xml");
   }
 
   private static Options createOptions() {

default-configuration/src/test/java/org/terracotta/config/provider/DefaultConfigurationProviderTest.java

@@ -278,7 +278,7 @@ public void testWithDefaultConfigurationInUserDirectory() throws Exception {
   public void testWithDefaultConfigurationInInstallationDirectory() throws Exception {
     Path temporaryDirectory = temporaryFolder.newFolder("conf").toPath();
     System.setProperty(Directories.TC_INSTALL_ROOT_PROPERTY_NAME, temporaryDirectory.getParent().toString());
-    Files.copy(this.getClass().getResourceAsStream("/simple-tc-config.xml"), Directories.getDefaultConfigFile());
+    Files.copy(this.getClass().getResourceAsStream("/simple-tc-config.xml"), Directories.getInstallationRoot().resolve("conf/tc-config.xml"));
 
     provider.initialize(Collections.<String>emptyList());
 

tc-server/src/main/java/com/tc/server/Bootstrap.java

@@ -116,8 +116,12 @@ public Future<Boolean> createServer(List<String> args, OutputStream out, ClassLo
     return new Future<Boolean>() {
       @Override
       public boolean cancel(boolean mayInterruptIfRunning) {
-       server.stop();
-       return true;
+       if (server.isStopped()) {
+         return false;
+       } else {
+         server.stop();
+         return true;
+       }
       }
 
       @Override
@@ -137,6 +141,7 @@ public Boolean get() throws InterruptedException, ExecutionException {
 
       @Override
       public Boolean get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+        //  for completeness , do not use
         long end = System.currentTimeMillis() + unit.toMillis(timeout);
         while (System.currentTimeMillis() < end) {
           if (!server.isStopped()) {
@@ -147,6 +152,18 @@ public Boolean get(long timeout, TimeUnit unit) throws InterruptedException, Exe
         }
         throw new TimeoutException();
       }
+      // for galvan compatiblity
+      public boolean waitUntilShutdown() {
+        try {
+          return get();
+        } catch (ExecutionException | InterruptedException e) {
+          return false;
+        }
+      }
+      
+      public Object getManagement() {
+        return server.getManagement();
+      }
     };
   }
 
@@ -365,7 +382,11 @@ public boolean waitUntilShutdown() {
         try {
           return impl.waitUntilShutdown();
         } finally {
-          TCLogbackLogging.resetLogging();
+          try {
+            TCLogbackLogging.resetLogging();
+          } catch (Exception e) {
+            // Ignore
+          }
         }
       }
 

terracotta-kit/src/assemble/server/lib/logback-ext.xml

@@ -19,9 +19,12 @@
 package com.tc.server;
 
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.NoSuchElementException;
+import java.util.Optional;
 
 /**
  * Knows how to find certain directories. You should try <em>everything</em> you can to avoid using this class; using it
@@ -46,15 +49,14 @@ public class Directories {
   /**
    */
   public static final String TC_SERVER_LIB_PROPERTY_NAME               = "tc.server-lib";
+  /**
+   */
+  public static final String TC_SERVER_JAR_PROPERTY_NAME               = "tc.server-jar";
   /**
    * The property "tc.install-root.ignore-checks", which is used for testing to ignore checks for the installation root
    * directory.
    */
   public static final String TC_INSTALL_ROOT_IGNORE_CHECKS_PROPERTY_NAME = "tc.install-root.ignore-checks";
-  /**
-   * Relative location for default configuration file under Terracotta installation directory
-   */
-  public static final String DEFAULT_CONFIG_FILE_LOCATION                    = "conf/tc-config.xml";
 
   /**
    * Get installation root directory.
@@ -64,7 +66,7 @@ public class Directories {
    * @throws FileNotFoundException If {@link #TC_INSTALL_ROOT_IGNORE_CHECKS_PROPERTY_NAME} has not been set,
    *         this exception may be thrown if the installation root directory is not a directory
    */
-  static Path getInstallationRoot() throws FileNotFoundException {
+  public static Path getInstallationRoot() throws FileNotFoundException {
     boolean ignoreCheck = Boolean.getBoolean(TC_INSTALL_ROOT_IGNORE_CHECKS_PROPERTY_NAME);
     if (ignoreCheck) {
       return Paths.get(System.getProperty("user.dir"));
@@ -87,36 +89,58 @@ static Path getInstallationRoot() throws FileNotFoundException {
     }
   }
 
-  public static Path getDefaultConfigFile() throws FileNotFoundException {
-    return getInstallationRoot().resolve(DEFAULT_CONFIG_FILE_LOCATION);
+  public static Path getServerJar() throws FileNotFoundException {
+    String jar = System.getProperty(TC_SERVER_JAR_PROPERTY_NAME);
+    if (jar == null) {
+      jar = "tc-server";
+    }
+    Path jarFile = searchForServerJar(getServerLibFolder(), jar);
+    if (jarFile == null) {
+      jarFile = searchForServerJar(getInstallationRoot(), jar);
+    }
+    
+    return jarFile;
+  }
+  
+  private static Path searchForServerJar(Path directory, String name) {
+    try {
+      Optional<Path> p = Files.list(directory).filter(f->f.getFileName().toString().startsWith(name)).findFirst();
+      Path option = p.get();
+      if (Files.exists(option) && Files.isRegularFile(option)) {
+        return option;
+      }
+      return null;
+    } catch (IOException | NoSuchElementException io) {
+      return null;
+    }
   }
 
   public static Path getServerLibFolder() throws FileNotFoundException {
-    String installRoot = System.getProperty(TC_INSTALL_ROOT_PROPERTY_NAME, System.getProperty("user.dir"));
-    String serverLib = System.getProperty(TC_PLUGINS_LIB_PROPERTY_NAME, "lib");
-    Path f = Paths.get(installRoot, serverLib);
+    Path installRoot = getInstallationRoot();
+    String serverLib = System.getProperty(TC_SERVER_LIB_PROPERTY_NAME, "lib");
+    Path f = installRoot.resolve(serverLib);
     if (!Files.isDirectory(f)) {
       throw new FileNotFoundException("server library folder at " + f.toAbsolutePath() + " is not valid");
     }
     return f;
   }
 
   public static Path getServerPluginsApiDir() throws FileNotFoundException {
-    String installRoot = System.getProperty(TC_INSTALL_ROOT_PROPERTY_NAME, System.getProperty("user.dir"));
+    Path installRoot = getInstallationRoot();
     String pluginsRoot = System.getProperty(TC_PLUGINS_ROOT_PROPERTY_NAME, "plugins");
     String pluginsApi = System.getProperty(TC_PLUGINS_API_PROPERTY_NAME, "api");
-    Path f = Paths.get(installRoot, pluginsRoot, pluginsApi);
+    Path f = installRoot.resolve(pluginsRoot).resolve(pluginsApi);
     if (!Files.isDirectory(f)) {
       throw new FileNotFoundException("server plugins api folder at " + f.toAbsolutePath() + " is not valid");
     }
     return f;
   }
 
   public static Path getServerPluginsLibDir() throws FileNotFoundException {
-    String installRoot = System.getProperty(TC_INSTALL_ROOT_PROPERTY_NAME, System.getProperty("user.dir"));
+    Path installRoot = getInstallationRoot();
     String pluginsRoot = System.getProperty(TC_PLUGINS_ROOT_PROPERTY_NAME, "plugins");
     String pluginsLib = System.getProperty(TC_PLUGINS_LIB_PROPERTY_NAME, "lib");
-    Path f = Paths.get(installRoot, pluginsRoot, pluginsLib);
+    Path f = installRoot.resolve(pluginsRoot).resolve(pluginsLib);
     if (!Files.isDirectory(f)) {
       throw new FileNotFoundException("server plugins implementations folder at " + f.toAbsolutePath() + " is not valid");
     }

terracotta/src/main/java/com/tc/server/CommonShutDownHook.java

@@ -62,9 +62,9 @@ public static Future<Boolean> createServer(List<String> args) {
   public static Future<Boolean> createServer(List<String> args, OutputStream console) {
     try {
       if (Files.isDirectory(Directories.getServerLibFolder())) {
-        Optional<Path> p = Files.list(Directories.getServerLibFolder()).filter(f->f.getFileName().toString().startsWith("tc-server")).findFirst();
-
-        ClassLoader serverClassLoader = new URLClassLoader(new URL[] {p.get().toUri().toURL()}, TCServerMain.class.getClassLoader());
+        Path serverJar = Directories.getServerJar();
+        
+        ClassLoader serverClassLoader = new URLClassLoader(new URL[] {serverJar.toUri().toURL()}, TCServerMain.class.getClassLoader());
 
         return ServerFactory.createServer(args, console, serverClassLoader);
       }