[jboss-cvs] JBossAS SVN: r59325 - trunk/system/src/main/org/jboss/system/server

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

Author: scott.stark at jboss.org
Date: 2007-01-04 03:47:11 -0500 (Thu, 04 Jan 2007)
New Revision: 59325

Modified:
   trunk/system/src/main/org/jboss/system/server/ServerLoader.java
Log:
Add jboss-managed.jar, jboss-metatype.jar to the bootstrap list

Modified: trunk/system/src/main/org/jboss/system/server/ServerLoader.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/ServerLoader.java	2007-01-04 06:45:32 UTC (rev 59324)
+++ trunk/system/src/main/org/jboss/system/server/ServerLoader.java	2007-01-04 08:47:11 UTC (rev 59325)
@@ -77,8 +77,33 @@
     * proper libraries.
     * TODO: use vfs to list the root directory
     */
-   public static final String DEFAULT_BOOT_LIBRARY_LIST =
-      "log4j-boot.jar,jboss-common-core.jar,jboss-logging-spi.jar,jboss-logging-log4j.jar,jboss-logging-jdk.jar,jboss-system.jar,jboss-xml-binding.jar,javassist.jar,jboss-aop-mc-int-boot.jar,jboss-vfs.jar,jboss-container.jar,jboss-dependency.jar,jboss-microcontainer.jar,jboss-deployers.jar,dom4j.jar,jboss-j2se.jar,jboss-mbeans.jar,jboss-jmx.jar,jboss-system-jmx.jar";
+   public static final String[] DEFAULT_BOOT_LIBRARY_LIST = {
+      // Logging
+      "log4j-boot.jar",
+      "jboss-common-core.jar",
+      "jboss-logging-spi.jar",
+      "jboss-logging-log4j.jar",
+      "jboss-logging-jdk.jar",
+      "jboss-xml-binding.jar",
+      // MC jars
+      "javassist.jar",
+      "jboss-aop-mc-int-boot.jar",
+      "jboss-vfs.jar",
+      "jboss-container.jar",
+      "jboss-dependency.jar",
+      "jboss-microcontainer.jar",
+      "jboss-managed.jar",
+      "jboss-metatype.jar",
+      "jboss-deployers.jar",
+      // Core server bootstrap
+      "jboss-system.jar",
+      // JMX related dependencies
+      "jboss-j2se.jar",
+      "dom4j.jar",
+      "jboss-mbeans.jar",
+      "jboss-jmx.jar",
+      "jboss-system-jmx.jar"
+   };
 
    /** The default server type. */
    public static final String DEFAULT_SERVER_TYPE = "org.jboss.system.server.profileservice.ServerImpl";
@@ -97,7 +122,7 @@
     * A list of extra URLs to add to the classpath when loading
     * the server.
     */
-   protected List extraClasspath = new LinkedList();
+   protected List<URL> extraClasspath = new LinkedList<URL>();
 
    /**
     * Construct a <tt>ServerLoader</tt>.
@@ -226,21 +251,31 @@
     */
    protected URL[] getBootClasspath() throws MalformedURLException
    {
-      List list = new LinkedList();
+      List<URL> list = new LinkedList<URL>();
 
       // prepend users classpath to allow for overrides
       list.addAll(extraClasspath);
 
-      String value = props.getProperty(ServerConfig.BOOT_LIBRARY_LIST, DEFAULT_BOOT_LIBRARY_LIST);
-
-      StringTokenizer stok = new StringTokenizer(value, ",");
-      while (stok.hasMoreElements())
+      String value = props.getProperty(ServerConfig.BOOT_LIBRARY_LIST);
+      if( value != null )
       {
-         URL url = new URL(libraryURL, stok.nextToken().trim());
-         list.add(url);
+         StringTokenizer stok = new StringTokenizer(value, ",");
+         while (stok.hasMoreElements())
+         {
+            URL url = new URL(libraryURL, stok.nextToken().trim());
+            list.add(url);
+         }
       }
+      else
+      {
+         for(String jar : DEFAULT_BOOT_LIBRARY_LIST)
+         {
+            URL url = new URL(libraryURL, jar);
+            list.add(url);            
+         }
+      }
 
-      return (URL[]) list.toArray(new URL[list.size()]);
+      return list.toArray(new URL[list.size()]);
    }
 
    /**