[jboss-cvs] jboss-seam/bootstrap/deployers ...

[Peter Muir]

  User: pmuir   
  Date: 08/01/10 18:23:32

  Modified:    bootstrap/deployers   ejb3-deployers-beans.xml
                        jca-deployers-beans.xml
  Log:
  Update bootstrap
  
  Revision  Changes    Path
  1.7       +131 -131  jboss-seam/bootstrap/deployers/ejb3-deployers-beans.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ejb3-deployers-beans.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap/deployers/ejb3-deployers-beans.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ejb3-deployers-beans.xml	5 Dec 2007 17:52:00 -0000	1.6
  +++ ejb3-deployers-beans.xml	10 Jan 2008 23:23:32 -0000	1.7
  @@ -30,7 +30,7 @@
         Default for this value is "false".
         
         -->
  -      <property name="deploymentDescriptorRequired">true</property>
  +      <property name="deploymentDescriptorRequired">false</property>
         
         <property name="ignoredJarsSet">
            <set elementClass="java.lang.String">
  
  
  
  1.7       +52 -9     jboss-seam/bootstrap/deployers/jca-deployers-beans.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jca-deployers-beans.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/bootstrap/deployers/jca-deployers-beans.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- jca-deployers-beans.xml	5 Dec 2007 17:52:00 -0000	1.6
  +++ jca-deployers-beans.xml	10 Jan 2008 23:23:32 -0000	1.7
  @@ -2,7 +2,7 @@
   
   <!--
       JCA Deployers
  -    $Id: jca-deployers-beans.xml,v 1.6 2007/12/05 17:52:00 pmuir Exp $
  +    $Id: jca-deployers-beans.xml,v 1.7 2008/01/10 23:23:32 pmuir Exp $
   -->
   <deployment xmlns="urn:jboss:bean-deployer:2.0">
   
  @@ -47,7 +47,6 @@
         <property name="type">jca-ds</property>
      </bean>
      
  -   
      <bean name="ManagedConnectionFactoryDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryDeployer">      
         <property name="repository"><inject bean="JCAMetaDataRepository"></inject></property>      
         <property name="builders">
  @@ -63,15 +62,59 @@
      </bean>
   
      <!-- The template for creating a datasource -->
  -   <bean name="DsDataSourceTemplate" class="org.jboss.resource.deployers.management.DsDataSourceTemplate">
  -      <property name="info"><inject bean="DsDataSourceTemplateInfo"/></property>
  +   <bean name="LocalTxDataSourceTemplate" class="org.jboss.resource.deployers.management.DsDataSourceTemplate">
  +      <property name="info"><inject bean="LocalTxDataSourceTemplateInfo"/></property>
  +   </bean>
  +   <bean name="LocalTxDataSourceTemplateInfo"
  +      class="org.jboss.resource.deployers.management.DsDataSourceTemplateInfo">
  +      <constructor>
  +         <parameter>LocalTxDataSourceTemplate</parameter>
  +         <parameter>A template for datasource *-ds.xml deployments</parameter>
  +         <parameter>local-tx-datasource</parameter>
  +      </constructor>
  +   </bean>
  +   <bean name="XADataSourceTemplate" class="org.jboss.resource.deployers.management.DsDataSourceTemplate">
  +      <property name="info"><inject bean="XADataSourceTemplateInfo"/></property>
  +   </bean>
  +   <bean name="XADataSourceTemplateInfo"
  +      class="org.jboss.resource.deployers.management.DsDataSourceTemplateInfo">
  +      <constructor>
  +         <parameter>XADataSourceTemplate</parameter>
  +         <parameter>A template for xa-datasource *-ds.xml deployments</parameter>
  +         <parameter>xa-datasource</parameter>
  +      </constructor>
  +   </bean>
  +   <bean name="NoTxDataSourceTemplate" class="org.jboss.resource.deployers.management.DsDataSourceTemplate">
  +      <property name="info"><inject bean="NoTxDataSourceTemplateInfo"/></property>
  +   </bean>
  +   <bean name="NoTxDataSourceTemplateInfo"
  +      class="org.jboss.resource.deployers.management.DsDataSourceTemplateInfo">
  +      <constructor>
  +         <parameter>NoTxDataSourceTemplate</parameter>
  +         <parameter>A template for no-tx-datasource *-ds.xml deployments</parameter>
  +         <parameter>no-tx-datasource</parameter>
  +      </constructor>
  +   </bean>
  +   <bean name="TxConnectionFactoryTemplate" class="org.jboss.resource.deployers.management.DsDataSourceTemplate">
  +      <property name="info"><inject bean="TxConnectionFactoryTemplateInfo"/></property>
  +   </bean>
  +   <bean name="TxConnectionFactoryTemplateInfo"
  +      class="org.jboss.resource.deployers.management.DsDataSourceTemplateInfo">
  +      <constructor>
  +         <parameter>TxConnectionFactoryTemplate</parameter>
  +         <parameter>A template for tx-connection-factory *-ds.xml deployments</parameter>
  +         <parameter>tx-connection-factory</parameter>
  +      </constructor>
  +   </bean>
  +   <bean name="NoTxConnectionFactoryTemplate" class="org.jboss.resource.deployers.management.DsDataSourceTemplate">
  +      <property name="info"><inject bean="NoTxConnectionFactoryTemplateInfo"/></property>
      </bean>
  -   <bean name="DsDataSourceTemplateInfo"
  +   <bean name="NoTxConnectionFactoryTemplateInfo"
         class="org.jboss.resource.deployers.management.DsDataSourceTemplateInfo">
         <constructor>
  -         <parameter>DsDataSourceTemplate</parameter>
  -         <parameter>A template for *-ds.xml deployments</parameter>
  -         <parameter>org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup</parameter>
  +         <parameter>NoTxConnectionFactoryTemplate</parameter>
  +         <parameter>A template for no-tx-connection-factory *-ds.xml deployments</parameter>
  +         <parameter>no-tx-connection-factory</parameter>
         </constructor>
      </bean>