[jboss-cvs] JBossAS SVN: r61568 - trunk/connector/src/resources/deployers.

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

Author: weston.price at jboss.com
Date: 2007-03-22 01:32:56 -0400 (Thu, 22 Mar 2007)
New Revision: 61568

Modified:
   trunk/connector/src/resources/deployers/jca-deployers-beans.xml
Log:
[JBAS-1425] Programmatic deployment improvements and cleanup.

Modified: trunk/connector/src/resources/deployers/jca-deployers-beans.xml
===================================================================
--- trunk/connector/src/resources/deployers/jca-deployers-beans.xml	2007-03-22 05:32:39 UTC (rev 61567)
+++ trunk/connector/src/resources/deployers/jca-deployers-beans.xml	2007-03-22 05:32:56 UTC (rev 61568)
@@ -5,8 +5,11 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
+   <bean name="JCAMetaDataRepository" class="org.jboss.resource.metadata.repository.JCAMetaDataRepository"/>      
+   
    <!-- RAR Deployment -->
    <bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
+      <property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
       <install bean="MainDeployer" method="addDeployer">
          <parameter><this/></parameter>
       </install>
@@ -15,6 +18,7 @@
       </uninstall>
       <property name="type">rar</property>
    </bean>
+   
    <bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
       <property name="workManagerName">jboss.jca:service=WorkManager</property>
       <property name="XATerminatorName">jboss:service=TransactionManager</property>
@@ -26,8 +30,10 @@
       </uninstall>
       <property name="type">rar</property>
    </bean>
-
-   <!-- ConnectionFactory Deployment -->
+   
+   
+   
+   <!-- ConnectionFactory Deployment --> 
    <bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
       <property name="suffix">-ds.xml</property>
       <property name="XSLPath">stylesheets/ConnectionFactoryTemplate.xsl</property>
@@ -39,16 +45,21 @@
       </uninstall>
       <property name="type">jca-ds</property>
    </bean>
+
    
    <!--
-   <bean name="MCFBuilder" class="org.jboss.resource.deployers.builder.ManagedConnectionFactoryBuilder"/>
+   <bean name="MCFBuilder" class="org.jboss.resource.deployers.builder.ManagedConnectionFactoryBuilder">
+      <property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
+   </bean>   
+   
    <bean name="PoolBuilder" class="org.jboss.resource.deployers.builder.ManagedConnectionPoolBuilder"/>
    <bean name="ConnectionManagerBuilder" class="org.jboss.resource.deployers.builder.ConnectionManagerBuilder"/>
    <bean name="ConnectionFactoryBindingBuilder" class="org.jboss.resource.deployers.builder.ConnectionFactoryBindingBuilder"/>
    <bean name="MetaDataTypeMappingBuilder" class="org.jboss.resource.deployers.builder.MetaDataTypeMappingBuilder"/>
    
    <bean name="ManagedConnectionFactoryParserDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryParserDeployer">
-      <property name="suffix">-cf.xml</property>
+      <property name="repository"><inject bean="JCAMetaDataRepository"></inject></property>
+      <property name="suffix">-ds.xml</property>      
       <install bean="MainDeployer" method="addDeployer">
          <parameter><this/></parameter>
       </install>
@@ -57,20 +68,19 @@
       </uninstall>
       <property name="type">jca-ds</property>
    </bean>
-
-      
-   <bean name="ManagedConnectionFactoryDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryDeployer">
-      
+   
+   
+   <bean name="ManagedConnectionFactoryDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryDeployer">      
+      <property name="repository"><inject bean="JCAMetaDataRepository"></inject></property>      
       <property name="builders">
-            <list>
-            <value class="org.jboss.resource.deployers.builder.ManagedConnectionFactoryBuilder"> <inject bean="MCFBuilder"/></value>
-            
-            <value> <inject bean="PoolBuilder"/></value>
-            <value> <inject bean="ConnectionManagerBuilder"/></value>
-            <value> <inject bean="ConnectionFactoryBindingBuilder"/></value>
-            <value> <inject bean="MetaDataTypeMappingBuilder"/></value>            
-         </list>
-       </property>                  
+         <list>
+            <inject bean="MCFBuilder"/>
+            <inject bean="PoolBuilder"/>
+            <inject bean="ConnectionManagerBuilder"/>
+            <inject bean="ConnectionFactoryBindingBuilder"/>
+            <inject bean="MetaDataTypeMappingBuilder"/>            
+         </list>            
+      </property>
       <install bean="MainDeployer" method="addDeployer">
          <parameter><this/></parameter>
       </install>