[jboss-cvs] JBossAS SVN: r61564 - 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 01:31:37 -0400 (Thu, 22 Mar 2007)
New Revision: 61564

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] Programmatic deployment improvements and cleanup.

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java	2007-03-22 05:31:20 UTC (rev 61563)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryDeployer.java	2007-03-22 05:31:37 UTC (rev 61564)
@@ -34,11 +34,17 @@
 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;
@@ -57,19 +63,21 @@
 {
    /** The suffix */
    private String suffix;
+   
+   /** The repository */
    private JCAMetaDataRepository repository;
-   private List<AbstractBuilder> builders;
    
+   /** The builders */
+   private List<AbstractBuilder> builders = new ArrayList<AbstractBuilder>();
    
-   public void setBuilders(List builders)
+   public void setBuilders(List<AbstractBuilder> builders)
    {
       this.builders = builders;
    }
    
-   public List getBuilders()
+   public List<AbstractBuilder> getBuilders()
    {
-      return Collections.unmodifiableList(builders);
-      
+      return this.builders;
    }
    
    /**
@@ -125,17 +133,27 @@
       
       List<ManagedConnectionFactoryDeploymentMetaData> deployments = group.getDeployments();
       ServiceDeployment serviceDeployment = new ServiceDeployment();
-      List<ServiceMetaData> componentServices = new ArrayList<ServiceMetaData>();
+      List<ServiceMetaData> componentServices = new ArrayList<ServiceMetaData>();            
+      List<ServiceMetaData> serviceDefintion = group.getServices();
       
-      componentServices.addAll(group.getServices());
+      //For some reason, this didn't like the addAll method
+      for (ServiceMetaData data : serviceDefintion)
+      {
+         componentServices.add(data);
+         
+      }
       
       for (ManagedConnectionFactoryDeploymentMetaData data : deployments)
       {         
          for (AbstractBuilder builder : builders)
          {
             ServiceMetaData candidate = builder.build(data);
-            componentServices.add(candidate);
             
+            if(candidate != null)
+            {
+               componentServices.add(candidate);               
+            }
+                           
          }
          
       }

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2007-03-22 05:31:20 UTC (rev 61563)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2007-03-22 05:31:37 UTC (rev 61564)
@@ -100,6 +100,7 @@
       context = JAXBContext.newInstance(new Class[]{getDeploymentType()});      
    }
    
+   
    @Override
    protected ManagedConnectionFactoryDeploymentGroup parse(DeploymentUnit unit, VirtualFile file, ManagedConnectionFactoryDeploymentGroup root) throws Exception
    {
@@ -111,9 +112,9 @@
       {
          JAXBElement<ManagedConnectionFactoryDeploymentGroup> elem = um.unmarshal(new StreamSource(is), ManagedConnectionFactoryDeploymentGroup.class);
          ManagedConnectionFactoryDeploymentGroup deployment = elem.getValue();
+         repository.addManagedConnectionFactoryDeploymentGroup(deployment);
          return deployment;
          
-         //TODO add to repository
       }
       finally
       {

Modified: trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java	2007-03-22 05:31:20 UTC (rev 61563)
+++ trunk/connector/src/main/org/jboss/resource/deployers/RARParserDeployer.java	2007-03-22 05:31:37 UTC (rev 61564)
@@ -26,6 +26,7 @@
 import org.jboss.deployers.spi.deployer.DeploymentUnit;
 import org.jboss.resource.deployment.ResourceAdapterObjectModelFactory;
 import org.jboss.resource.metadata.ConnectorMetaData;
+import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.xb.binding.ObjectModelFactory;
 
@@ -37,6 +38,18 @@
  */
 public class RARParserDeployer extends ObjectModelFactoryDeployer<ConnectorMetaData>
 {
+   private JCAMetaDataRepository metaDataRepository;
+      
+   public JCAMetaDataRepository getMetaDataRepository()
+   {
+      return metaDataRepository;
+   }
+
+   public void setMetaDataRepository(JCAMetaDataRepository metaDataRepository)
+   {
+      this.metaDataRepository = metaDataRepository;
+   }
+
    /**
     * Create a new RARParserDeployer.
     */
@@ -49,7 +62,20 @@
    {
       return new ResourceAdapterObjectModelFactory();
    }
-
+   
+   @Override
+   protected ConnectorMetaData parse(DeploymentUnit unit, String name, ConnectorMetaData root) throws Exception
+   {
+      ConnectorMetaData md = super.parse(unit, name, root);
+      
+      //TODO should we aspectize this? 
+      if(md != null)
+      {
+         metaDataRepository.addConnectorMetaData(unit.getSimpleName(), md);         
+      }
+      return md;
+   
+   }
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
       createMetaData(unit, "ra.xml", null);