[jboss-cvs] JBossAS SVN: r65073 - trunk/connector/src/main/org/jboss/resource/deployers.

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

Author: scott.stark at jboss.org
Date: 2007-09-04 22:26:39 -0400 (Tue, 04 Sep 2007)
New Revision: 65073

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
   trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
Log:
JBAS-4377, move the ManagedObjectCreator to the parsing deployer

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java	2007-09-05 02:16:15 UTC (rev 65072)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java	2007-09-05 02:26:39 UTC (rev 65073)
@@ -28,13 +28,9 @@
 
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
-import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
 import org.jboss.deployers.spi.management.KnownComponentTypes;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.managed.api.ComponentType;
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.factory.ManagedObjectFactory;
-import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
 import org.jboss.resource.deployers.builder.AbstractBuilder;
 import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
@@ -55,7 +51,6 @@
  */
 public class ManagedConnectionFactoryDeployer
    extends AbstractSimpleRealDeployer<ManagedConnectionFactoryDeploymentGroup>
-   implements ManagedObjectCreator
 {
    /** The repository */
    private DefaultJCAMetaDataRepository repository;
@@ -198,17 +193,4 @@
    {      
    }
 
-   public void build(DeploymentUnit unit, Map<String, ManagedObject> managedObjects)
-      throws DeploymentException
-   {
-      ManagedObjectFactory factory = ManagedObjectFactoryBuilder.create();
-      ManagedConnectionFactoryDeploymentGroup mcfdg = unit.getAttachment(getInput());
-      if (mcfdg != null)
-      {
-         ManagedObject mo = factory.initManagedObject(mcfdg, null, null);
-         if (mo != null)
-            managedObjects.put(mo.getName(), mo);
-      }
-   }
-
 }

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2007-09-05 02:16:15 UTC (rev 65072)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2007-09-05 02:26:39 UTC (rev 65073)
@@ -59,8 +59,9 @@
    {
       super(ManagedConnectionFactoryDeploymentGroup.class);
       setIncludeDeploymentFile(true);
+      setBuildManagedObject(true);
    }
-   
+
    /**
     * Get the repository.
     *