[jboss-cvs] JBossAS SVN: r88162 - in projects/bootstrap/trunk: impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit and 1 other directories.

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

Author: ALRubinger
Date: 2009-05-04 15:44:28 -0400 (Mon, 04 May 2009)
New Revision: 88162

Modified:
   projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java
   projects/bootstrap/trunk/impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit/MCServerUnitTestCase.java
   projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCBasedServer.java
Log:
[JBBOOT-60] Expose getDeployments() from MCServer

Modified: projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java
===================================================================
--- projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java	2009-05-04 17:51:49 UTC (rev 88161)
+++ projects/bootstrap/trunk/impl-mc/src/main/java/org/jboss/bootstrap/impl/mc/server/AbstractMCServerBase.java	2009-05-04 19:44:28 UTC (rev 88162)
@@ -25,6 +25,7 @@
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.bootstrap.impl.base.server.AbstractServer;
@@ -38,7 +39,9 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
 import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
 import org.jboss.logging.Logger;
+import org.jboss.managed.api.annotation.ManagementProperty;
 
 /**
  * AbstractMCServerBase
@@ -119,11 +122,25 @@
    /* (non-Javadoc)
     * @see org.jboss.bootstrap.spi.mc.server.MCServer#getKernel()
     */
+   @ManagementProperty(ignored = true)
    public Kernel getKernel()
    {
       return this.kernel;
    }
 
+   /*
+    * (non-Javadoc)
+    * @see org.jboss.bootstrap.spi.mc.server.MCBasedServer#getDeployments()
+    */
+   @ManagementProperty(ignored = true)
+   public Map<String, KernelDeployment> getDeployments()
+   {
+      Map<String, KernelDeployment> deployments = null;
+      if (kernelDeployer != null)
+         deployments = kernelDeployer.getDeployments();
+      return deployments;
+   }
+
    /* (non-Javadoc)
     * @see org.jboss.bootstrap.spi.server.AbstractServer#doShutdown()
     */
@@ -243,7 +260,6 @@
          // Deploy the bootstrap urls
          for (String bootstrapURL : bootstrapURLs)
          {
-            log.debug("BEFORE: " + bootstrapURL);
             final URL suburl = new URL(homeUrl, bootstrapURL);
             log.debug("Deploying bootstrap xml: " + suburl);
             kernelDeployer.deploy(suburl);

Modified: projects/bootstrap/trunk/impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit/MCServerUnitTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit/MCServerUnitTestCase.java	2009-05-04 17:51:49 UTC (rev 88161)
+++ projects/bootstrap/trunk/impl-mc/src/test/java/org/jboss/bootstrap/impl/mc/server/unit/MCServerUnitTestCase.java	2009-05-04 19:44:28 UTC (rev 88162)
@@ -23,6 +23,7 @@
 package org.jboss.bootstrap.impl.mc.server.unit;
 
 import java.net.URL;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
@@ -37,6 +38,7 @@
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
 import org.jboss.logging.Logger;
 import org.junit.After;
 import org.junit.Before;
@@ -139,16 +141,34 @@
        * Install a test MC bean into the Server, ensure MC takes
        * over and lifecycle is invoked
        */
-      final Pojo pojo = new Pojo();
-      final String mcBindName = BIND_NAME_POJO;
-      final BeanMetaData beanMD = BeanMetaDataBuilder.createBuilder(mcBindName, pojo.getClass().getName())
-            .getBeanMetaData();
-      final KernelController controller = server.getKernel().getController();
-      controller.install(beanMD, pojo);
+      this.installPojo(server);
       this.assertPojo();
    }
 
    /**
+    * Ensures that a deployed bean is available via 
+    * {@link MCServer#getDeployments()}
+    */
+   @Test
+   public void testKernelDeployments() throws Throwable
+   {
+      // Log
+      log.info("testKernelDeployments");
+
+      // Set name to deploy a test POJO via XML
+      server.getConfiguration().bootstrapName(NAME_BOOTSTRAP_POJO);
+
+      // Start
+      server.start();
+
+      // Get the Deployment
+      final Map<String, KernelDeployment> deployments = server.getDeployments();
+
+      // Ensure the deployment is there
+      TestCase.assertEquals("Wrong number of expected kernel deployments", 1, deployments.size());
+   }
+
+   /**
     * Ensures that deployment from a bootstrap.xml succeeds as expected
     * 
     * @throws Throwable
@@ -198,6 +218,25 @@
    }
 
    /**
+    * Installs a POJO into the specified server
+    * 
+    * @param server
+    * @throws Throwable
+    */
+   private void installPojo(final MCServer server) throws Throwable
+   {
+      // Construct BeanMetaData
+      final Pojo pojo = new Pojo();
+      final String mcBindName = BIND_NAME_POJO;
+      final BeanMetaData beanMD = BeanMetaDataBuilder.createBuilder(mcBindName, pojo.getClass().getName())
+            .getBeanMetaData();
+
+      // Get the controller and install
+      log.info("Installing test POJO under name " + mcBindName + " into " + server + "...");
+      server.getKernel().getController().install(beanMD, pojo);
+   }
+
+   /**
     * Ensures that the POJO is installed at {@link MCServerUnitTestCase#BIND_NAME_POJO}
     * and has no expected value
     * 

Modified: projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCBasedServer.java
===================================================================
--- projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCBasedServer.java	2009-05-04 17:51:49 UTC (rev 88161)
+++ projects/bootstrap/trunk/spi-mc/src/main/java/org/jboss/bootstrap/spi/mc/server/MCBasedServer.java	2009-05-04 19:44:28 UTC (rev 88162)
@@ -22,9 +22,12 @@
 
 package org.jboss.bootstrap.spi.mc.server;
 
+import java.util.Map;
+
 import org.jboss.bootstrap.spi.mc.config.MCBasedServerConfig;
 import org.jboss.bootstrap.spi.server.Server;
 import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
 
 /**
  * MCBasedServer
@@ -47,4 +50,11 @@
     * @return
     */
    Kernel getKernel();
+
+   /**
+    * Obtains the deployments currently deployed on this server 
+    * 
+    * @return
+    */
+   Map<String, KernelDeployment> getDeployments();
 }