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

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

Author: weston.price at jboss.com
Date: 2007-03-22 13:56:04 -0400 (Thu, 22 Mar 2007)
New Revision: 61597

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
   trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
   trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java
Log:
[JBAS-1425] New deployment module representing an MCF deployment.

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java	2007-03-22 17:30:01 UTC (rev 61596)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java	2007-03-22 17:56:04 UTC (rev 61597)
@@ -22,36 +22,17 @@
 package org.jboss.resource.deployers;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
-import javax.management.ObjectName;
-
 import org.jboss.deployers.plugins.deployers.helpers.AbstractSimpleRealDeployer;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.resource.connectionmanager.JBossManagedConnectionPool;
-import org.jboss.resource.connectionmanager.NoTxConnectionManager;
-import org.jboss.resource.connectionmanager.TxConnectionManager;
 import org.jboss.resource.deployers.builder.AbstractBuilder;
-import org.jboss.resource.deployers.builder.ConnectionFactoryBindingBuilder;
-import org.jboss.resource.deployers.builder.ConnectionManagerBuilder;
-import org.jboss.resource.deployers.builder.ManagedConnectionFactoryBuilder;
-import org.jboss.resource.deployers.builder.ManagedConnectionPoolBuilder;
-import org.jboss.resource.deployers.builder.MetaDataTypeMappingBuilder;
-import org.jboss.resource.metadata.ConnectorMetaData;
-import org.jboss.resource.metadata.mcf.DataSourceDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryTransactionSupportMetaData;
-import org.jboss.resource.metadata.mcf.MetaDataTypeMappingAdapter;
-import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
-import org.jboss.system.metadata.ServiceAttributeMetaData;
-import org.jboss.system.metadata.ServiceConstructorMetaData;
-import org.jboss.system.metadata.ServiceDependencyValueMetaData;
+import org.jboss.resource.metadata.repository.DefaultJCAMetaDataRepository;
 import org.jboss.system.metadata.ServiceDeployment;
 import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.system.metadata.ServiceTextValueMetaData;
 
 /**
  * A ManagedConnectionFactoryDeployer.
@@ -65,7 +46,7 @@
    private String suffix;
    
    /** The repository */
-   private JCAMetaDataRepository repository;
+   private DefaultJCAMetaDataRepository repository;
    
    /** The builders */
    private List<AbstractBuilder> builders = new ArrayList<AbstractBuilder>();
@@ -85,7 +66,7 @@
     * 
     * @return the repository.
     */
-   public JCAMetaDataRepository getRepository()
+   public DefaultJCAMetaDataRepository getRepository()
    {
       return repository;
    }
@@ -95,7 +76,7 @@
     * 
     * @param repository The repository to set.
     */
-   public void setRepository(JCAMetaDataRepository repository)
+   public void setRepository(DefaultJCAMetaDataRepository repository)
    {
       this.repository = repository;
    }
@@ -162,6 +143,7 @@
       unit.addAttachment(ServiceDeployment.class, serviceDeployment);
       
    }
+
    @Override
    public void undeploy(DeploymentUnit unit, ManagedConnectionFactoryDeploymentGroup deployment)
    {      

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2007-03-22 17:30:01 UTC (rev 61596)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2007-03-22 17:56:04 UTC (rev 61597)
@@ -31,7 +31,9 @@
 import org.jboss.deployers.plugins.deployers.helpers.AbstractParsingDeployer;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.logging.Logger;
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
+import org.jboss.resource.metadata.repository.DefaultJCAMetaDataRepository;
 import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
 import org.jboss.virtual.VirtualFile;
 
@@ -44,9 +46,17 @@
  * Note, this is currently a total hack until we can rework the JAXBDeployer
  */
 public class ManagedConnectionFactoryParserDeployer extends AbstractParsingDeployer<ManagedConnectionFactoryDeploymentGroup>
-{
+{   
+   /** The log */
+   private static final Logger log = Logger.getLogger(ManagedConnectionFactoryParserDeployer.class);
+   
+   /** The context */
    private JAXBContext context;   
+   
+   /** The repository */
    private JCAMetaDataRepository repository;
+   
+   /** The suffix */
    private String suffix;
       
    public ManagedConnectionFactoryParserDeployer()
@@ -115,11 +125,13 @@
          repository.addManagedConnectionFactoryDeploymentGroup(deployment);
          return deployment;
          
-      }
+      }      
       finally
       {
          if(is != null)
-            is.close();
+         {
+            is.close();            
+         }
       }
             
       

Modified: trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java	2007-03-22 17:30:01 UTC (rev 61596)
+++ trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java	2007-03-22 17:56:04 UTC (rev 61597)
@@ -40,6 +40,14 @@
 {
    private JCAMetaDataRepository metaDataRepository;
       
+   /**
+    * Create a new RARParserDeployer.
+    */
+   public RARParserDeployer()
+   {
+      super(ConnectorMetaData.class);
+   }
+
    public JCAMetaDataRepository getMetaDataRepository()
    {
       return metaDataRepository;
@@ -50,14 +58,6 @@
       this.metaDataRepository = metaDataRepository;
    }
 
-   /**
-    * Create a new RARParserDeployer.
-    */
-   public RARParserDeployer()
-   {
-      super(ConnectorMetaData.class);
-   }
-
    protected ObjectModelFactory getObjectModelFactory(ConnectorMetaData root)
    {
       return new ResourceAdapterObjectModelFactory();
@@ -73,6 +73,7 @@
       {
          metaDataRepository.addConnectorMetaData(unit.getSimpleName(), md);         
       }
+      
       return md;
    
    }