[jboss-cvs] JBossAS SVN: r88891 - projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-05-14 15:21:26 -0400 (Thu, 14 May 2009)
New Revision: 88891

Modified:
   projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
   projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerManager.java
Log:
[JBASM-30] Set system property "java.endorsed.dirs"

Modified: projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
===================================================================
--- projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2009-05-14 19:13:50 UTC (rev 88890)
+++ projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2009-05-14 19:21:26 UTC (rev 88891)
@@ -47,6 +47,21 @@
 
    private static final String MAIN = "org.jboss.Main"; 
    
+   /**
+    * Name of the system property denoting the location of endorsed libraries 
+    */
+   private static final String SYS_PROP_JAVA_ENDORSED_DIRS = "java.endorsed.dirs";
+   
+   /**
+    * CML switch denoting a system property will follow
+    */
+   private static final String SWITCH_SYSPROP = "-D";
+   
+   /**
+    * Character for '='
+    */
+   private static final char EQUALS = '=';
+   
    // delay (in ms) to guarantee that a destroyed process cannot respond with true
    // to ServerController.isServerStarted()
    private static final long PROCESS_DESTROY_DELAY = 45 * 1000 ;
@@ -145,7 +160,15 @@
          logFile.getParentFile().mkdir();
       }
 
-      logFile.createNewFile();
+      try
+      {
+         logFile.createNewFile();
+      }
+      catch (final IOException ioe)
+      {
+         // Because the IOE tells you nothing about the file trying to be created
+         throw new RuntimeException("Could not create new file: " + logFile.getAbsolutePath(), ioe);
+      }
    }
 
    /** 
@@ -160,6 +183,7 @@
    {
       String execCmd = manager.getJavaExecutable() + " -cp " + manager.getStartClasspath() + " ";
       execCmd = execCmd + server.getJvmArgs() + server.getSysProperties() + server.getLoggingProperty();
+      execCmd = execCmd + " " + getEndorsedDirsProperty(manager);
       execCmd = execCmd + " " + MAIN + " -c " + server.getConfig() + " -b " + server.getHost() + " -g " + server.getPartition();
       
       if (manager.getUdpGroup() != null && ! manager.getUdpGroup().equals(""))
@@ -169,6 +193,18 @@
       execCmd = execCmd + " " + server.getArgs();
       return execCmd;
    }
+   
+   /**
+    * Obtains the full endorsed dirs property, (ie. "-Djava.endorsed.dirs=/path/to/place")
+    * 
+    * @param manager The {@link ServerManager} to consult in obtaining the location
+    *       relative to $JBOSS_HOME
+    * @return
+    */
+   private static final String getEndorsedDirsProperty(final ServerManager manager)
+   {
+         return SWITCH_SYSPROP + SYS_PROP_JAVA_ENDORSED_DIRS + EQUALS +manager.getJavaEndorsedDirs();
+   }
 
    /**
     * Get the server shutdown command line.

Modified: projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerManager.java
===================================================================
--- projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerManager.java	2009-05-14 19:13:50 UTC (rev 88890)
+++ projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerManager.java	2009-05-14 19:21:26 UTC (rev 88891)
@@ -247,6 +247,16 @@
    {
       return jbossHome;
    }
+   
+   /**
+    * Returns the value to use for java endorsed lib location.
+    * (ie. $JBOSS_HOME/lib/endorsed/)
+    * @return
+    */
+   public String getJavaEndorsedDirs()
+   {
+      return jbossHome + "lib/endorsed/";
+   }
 
    /** 
     * How long to wait (in seconds) for a server to shutdown