[jboss-cvs] JBossAS SVN: r84452 - in branches/Branch_5_0: server/src/etc/conf/default/bootstrap and 1 other directory.

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

Author: alesj
Date: 2009-02-19 07:49:03 -0500 (Thu, 19 Feb 2009)
New Revision: 84452

Modified:
   branches/Branch_5_0/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java
   branches/Branch_5_0/server/src/etc/conf/default/bootstrap/deployers.xml
   branches/Branch_5_0/server/src/etc/conf/default/bootstrap/vfs.xml
Log:
[JBCTS-901, JBAS-6514]; fix deployment manager service, add bean annotation adapter in boot.

Modified: branches/Branch_5_0/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java
===================================================================
--- branches/Branch_5_0/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java	2009-02-19 11:55:30 UTC (rev 84451)
+++ branches/Branch_5_0/deployment/src/main/org/jboss/deployment/services/DeploymentManagerService.java	2009-02-19 12:49:03 UTC (rev 84452)
@@ -296,8 +296,7 @@
    }
 
    /* Invoke the method on the contexts */
-   public void hack(SerializableTargetModuleID moduleID,
-         DeploymentContext info, String method)
+   public void hack(SerializableTargetModuleID moduleID, DeploymentContext info, String method)
    {
       try {
          MBeanServer server = MBeanServerLocator.locateJBoss();
@@ -381,8 +380,7 @@
       if (data == null)
          return null;
       ObjectName objectName = data.getObjectName();
-      String objNames = objectName.toString();
-      return objNames;
+      return objectName.toString();
    }
 
    public void deploy_phase2(String url) throws Exception
@@ -406,10 +404,11 @@
       VirtualFile root = VFS.getRoot(deployFile.toURI());
       Deployment deployment = deploymentFactory.createVFSDeployment(root);
       mainDeployer.addDeployment(deployment);
-      DeploymentContext context = mainDeployer.getDeploymentContext(deployment.getName());
+      DeploymentContext context = null;
       try
       {
          mainDeployer.process();
+         context = mainDeployer.getDeploymentContext(deployment.getName());
          mainDeployer.checkComplete(deployment);
       }
       catch (Exception e)

Modified: branches/Branch_5_0/server/src/etc/conf/default/bootstrap/deployers.xml
===================================================================
--- branches/Branch_5_0/server/src/etc/conf/default/bootstrap/deployers.xml	2009-02-19 11:55:30 UTC (rev 84451)
+++ branches/Branch_5_0/server/src/etc/conf/default/bootstrap/deployers.xml	2009-02-19 12:49:03 UTC (rev 84452)
@@ -17,6 +17,9 @@
       <root>${jboss.lib.url}jboss-deployers-impl.jar</root>
       <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
       <root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
+     <!-- Bean annotation handling -->
+      <root>${jboss.lib.url}jboss-dependency.jar</root>
+      <root>${jboss.lib.url}jboss-kernel.jar</root>
 
       <!-- JAXB impl here, api is in endorsed -->
       <root>${jboss.lib.url}jaxb-impl.jar</root>
@@ -177,6 +180,19 @@
    </bean>
 
    <!-- POJO Deployment -->
+  
+   <bean name="CoreBeanAnnotationAdapterFactory">
+      <constructor factoryClass="org.jboss.kernel.plugins.annotations.BeanAnnotationAdapterFactory" factoryMethod="getInstance"/>
+   </bean>
+
+   <bean name="CoreBeanAnnotationAdapter">
+      <constructor factoryMethod="getBeanAnnotationAdapter">
+        <factory bean="CoreBeanAnnotationAdapterFactory"/>
+      </constructor>
+      <incallback method="addAnnotationPlugin"/>
+      <uncallback method="removeAnnotationPlugin"/>
+   </bean>
+
    <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
       <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
    </bean>

Modified: branches/Branch_5_0/server/src/etc/conf/default/bootstrap/vfs.xml
===================================================================
--- branches/Branch_5_0/server/src/etc/conf/default/bootstrap/vfs.xml	2009-02-19 11:55:30 UTC (rev 84451)
+++ branches/Branch_5_0/server/src/etc/conf/default/bootstrap/vfs.xml	2009-02-19 12:49:03 UTC (rev 84452)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   The JBossAS initializer configuration.
+   The JBossVFS initializer configuration.
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">