[jboss-cvs] JBossAS SVN: r76699 - in trunk: bootstrap/src/main/org/jboss/bootstrap/microcontainer and 1 other directories.

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

Author: alesj
Date: 2008-08-06 03:50:48 -0400 (Wed, 06 Aug 2008)
New Revision: 76699

Modified:
   trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java
   trunk/bootstrap/src/main/org/jboss/bootstrap/microcontainer/ServerImpl.java
   trunk/main/src/main/org/jboss/system/server/ServerConfig.java
Log:
[JBAS-5760]; fix jboss.bootstrap.url usage.

Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java	2008-08-06 06:40:05 UTC (rev 76698)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/BaseServerConfig.java	2008-08-06 07:50:48 UTC (rev 76699)
@@ -145,7 +145,7 @@
          {
             bootstrapURL = getURL(ServerConfig.BOOTSTRAP_URL);
             if (bootstrapURL != null)
-               System.setProperty(ServerConfig.BOOTSTRAP_URL, BOOTSTRAP_URL.toString());
+               System.setProperty(ServerConfig.BOOTSTRAP_URL, bootstrapURL.toString());
          }
          catch (MalformedURLException e)
          {

Modified: trunk/bootstrap/src/main/org/jboss/bootstrap/microcontainer/ServerImpl.java
===================================================================
--- trunk/bootstrap/src/main/org/jboss/bootstrap/microcontainer/ServerImpl.java	2008-08-06 06:40:05 UTC (rev 76698)
+++ trunk/bootstrap/src/main/org/jboss/bootstrap/microcontainer/ServerImpl.java	2008-08-06 07:50:48 UTC (rev 76699)
@@ -94,10 +94,8 @@
       URL configURL = getConfig().getServerConfigURL();
       URL url = getConfig().getBootstrapURL();
       if (url == null)
-      {
          url = new URL(configURL, BOOTSTRAP_XML_NAME);
-         log.info("Starting Microcontainer, bootstrapURL=" + url);
-      }
+      log.info("Starting Microcontainer, bootstrapURL=" + url);
 
       // Parse the bootstrap metadata
       BootstrapMetaData bootstrapMetaData = BootstrapParser.parse(url);

Modified: trunk/main/src/main/org/jboss/system/server/ServerConfig.java
===================================================================
--- trunk/main/src/main/org/jboss/system/server/ServerConfig.java	2008-08-06 06:40:05 UTC (rev 76698)
+++ trunk/main/src/main/org/jboss/system/server/ServerConfig.java	2008-08-06 07:50:48 UTC (rev 76699)
@@ -74,7 +74,7 @@
    /**
     * The bootstrap url
     *
-    * <p>If not set then the server will default to {@link #DEFAULT_ROOT_DEPLOYMENT_FILENAME}.
+    * <p>If not set then the server will default to {@link #SERVER_CONFIG_URL/bootstrap.xml}.
     */
    String BOOTSTRAP_URL = "jboss.bootstrap.url";
 
@@ -200,7 +200,7 @@
     * Constant that holds the name of the environment property
     * for specifying the server configuration URL.
     *
-    * <p>Defaults to <tt><em>SERVER_HOME_UTL</em>/conf</tt> .
+    * <p>Defaults to <tt><em>SERVER_HOME_URL</em>/conf</tt> .
     */
    String SERVER_CONFIG_URL = "jboss.server.config.url";