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

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

Author: scott.stark at jboss.org
Date: 2007-02-01 20:22:39 -0500 (Thu, 01 Feb 2007)
New Revision: 60172

Modified:
   trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
Log:
Install the JBossServer before loading the bootrap xml.

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java	2007-02-01 23:56:49 UTC (rev 60171)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java	2007-02-02 01:22:39 UTC (rev 60172)
@@ -31,7 +31,6 @@
 import org.jboss.deployers.spi.IncompleteDeploymentException;
 import org.jboss.deployers.spi.IncompleteDeployments;
 import org.jboss.deployers.spi.IncompleteDeploymentsBuilder;
-import org.jboss.deployers.spi.deployer.Deployer;
 import org.jboss.deployers.spi.deployment.MainDeployer;
 import org.jboss.deployers.spi.structure.DeploymentContext;
 import org.jboss.kernel.Kernel;
@@ -46,7 +45,7 @@
 
 /**
  * An extension of the kernel basic bootstrap that boots the mc from
- * {profileName}/deployer-beans.xml descriptors using the BasicXMLDeployer, and
+ * {profileName}/bootstrap-beans.xml descriptors using the BasicXMLDeployer, and
  * loads additional deployments using the ProfileService.
  * 
  * @author Scott.Stark at jboss.org
@@ -189,6 +188,16 @@
 
       kernelDeployer = new BasicXMLDeployer(getKernel());
 
+      Kernel kernel = getKernel();
+      controller = kernel.getController();
+
+      // Register the Server instance in the kernel
+      if (server != null)
+      {
+         AbstractBeanMetaData metaData = new AbstractBeanMetaData("JBossServer", server.getClass().getName());
+         controller.install(metaData, server);
+      }
+
       if (bootstrapURL == null)
       {
          ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -223,16 +232,6 @@
          deploy(bootstrapURL);
       }
 
-      Kernel kernel = getKernel();
-      controller = kernel.getController();
-
-      // Register the Server instance in the kernel
-      if (server != null)
-      {
-         AbstractBeanMetaData metaData = new AbstractBeanMetaData("JBossServer", server.getClass().getName());
-         controller.install(metaData, server);
-      }
-
       // Validate that everything is ok
       checkIncomplete();
 
@@ -361,7 +360,7 @@
          deployer.process();
          checkIncomplete();
 
-         // Deploy the profile deployments
+         // Deploy the profile applications
          Collection<DeploymentContext> profileDeployments = profile.getDeployments(DeploymentPhase.APPLICATION);
          for (DeploymentContext d : profileDeployments)
             deployer.addDeploymentContext(d);


Property changes on: trunk/system/src/main/org/jboss/system/server/profileservice/ProfileServiceBootstrap.java
___________________________________________________________________
Name: svn:keywords
   + Id, Revision