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

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

Author: scott.stark at jboss.org
Date: 2006-11-14 18:42:11 -0500 (Tue, 14 Nov 2006)
New Revision: 58367

Modified:
   trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
   trunk/system/src/main/org/jboss/system/server/profileservice/ServerImpl.java
Log:
Change the bootstrap kernel beans descriptor to bootstrap-beans.xml form deployer-beans.xml

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java	2006-11-14 23:38:31 UTC (rev 58366)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java	2006-11-14 23:42:11 UTC (rev 58367)
@@ -53,7 +53,7 @@
 public class ProfileServiceBootstrap extends BasicBootstrap
 {
    /** The bootstrap file */
-   public static String DEPLOYERS_XML_NAME = "deployer-beans.xml";
+   public static String BOOTSTRAP_XML_NAME = "bootstrap-beans.xml";
 
    /** The name of the profile that is being booted */
    protected String profileName;
@@ -193,9 +193,9 @@
 
          String bootstrapResName;
          if (deployerBeansPrefix == null)
-            bootstrapResName = profileName + "/" + DEPLOYERS_XML_NAME;
+            bootstrapResName = profileName + "/" + BOOTSTRAP_XML_NAME;
          else
-            bootstrapResName = deployerBeansPrefix + DEPLOYERS_XML_NAME;
+            bootstrapResName = deployerBeansPrefix + BOOTSTRAP_XML_NAME;
          
          log.debug("Scanning for bootstrap resources: " + bootstrapResName);
          Enumeration<URL> descriptors = cl.getResources(bootstrapResName);

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/ServerImpl.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/ServerImpl.java	2006-11-14 23:38:31 UTC (rev 58366)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/ServerImpl.java	2006-11-14 23:42:11 UTC (rev 58367)
@@ -380,7 +380,7 @@
       else
       {
          URL configURL = config.getServerConfigURL();
-         URL bootstrapURL = new URL(configURL, ProfileServiceBootstrap.DEPLOYERS_XML_NAME);
+         URL bootstrapURL = new URL(configURL, ProfileServiceBootstrap.BOOTSTRAP_XML_NAME);
          log.info("Starting Microcontainer, bootstrapURL="+bootstrapURL);
          bootstrap.setBootstrapURL(bootstrapURL);
       }