[jboss-cvs] JBossAS SVN: r67656 - in trunk/embedded: src/main/resources/javase/deployers and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Nov 30 08:36:23 EST 2007


Author: petemuir
Date: 2007-11-30 08:36:23 -0500 (Fri, 30 Nov 2007)
New Revision: 67656

Modified:
   trunk/embedded/build.xml
   trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
Log:
new jca deployers beans

Modified: trunk/embedded/build.xml
===================================================================
--- trunk/embedded/build.xml	2007-11-30 13:15:19 UTC (rev 67655)
+++ trunk/embedded/build.xml	2007-11-30 13:36:23 UTC (rev 67656)
@@ -329,7 +329,18 @@
          <fileset dir="${junit.junit.lib}">
             <include name="*.jar"/>
          </fileset>
-      </copy>
+      </copy>
+   	  <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-deployers.jar">
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client-spi.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core-spi.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-impl.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-spi.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-structure-spi.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs.jar"/>
+         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs-spi.jar"/>
+   	  </jar>
 
       <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-tomcat-bootstrap.jar">
          <fileset dir="${build.classes}">
@@ -337,11 +348,20 @@
             <include name="org/jboss/embedded/tomcat/WebinfScanner.class"/>
             <include name="org/jboss/embedded/tomcat/security/*.class"/>
          </fileset>
-      </jar>
+      </jar>
+   	
+   	  <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-api.jar">
+   	     <fileset dir="${build.classes}">
+   	        <include name="org/jboss/embedded/**"/>
+   	        <exclude name="org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.class"/>
+   	        <exclude name="org/jboss/embedded/tomcat/WebinfScanner.class"/>
+   	        <exclude name="org/jboss/embedded/tomcat/security/*.class"/>
+   	     </fileset>
+   	  </jar>
 
       <jar jarfile="${build.lib}/embedded-jboss/lib/jboss-embedded-all.jar">
          <fileset dir="${build.classes}">
-            <include name="org/jboss/**"/>
+            <exclude name="org/jboss/embedded/**"/>
             <exclude name="org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.class"/>
             <exclude name="org/jboss/embedded/tomcat/WebinfScanner.class"/>
             <exclude name="org/jboss/embedded/tomcat/security/*.class"/>
@@ -382,15 +402,6 @@
          <zipfileset src="${jboss.microcontainer.lib}/jboss-container.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-classloader.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-dependency.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-client-spi.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-core-spi.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-impl.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-spi.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-structure-spi.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs.jar"/>
-         <zipfileset src="${jboss.microcontainer.lib}/jboss-deployers-vfs-spi.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-aop-mc-int.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-metatype.jar"/>
          <zipfileset src="${jboss.microcontainer.lib}/jboss-managed.jar"/>
@@ -422,8 +433,8 @@
          <zipfileset src="${jboss.jboss.jaspi.api.lib}/jboss-jaspi-api.jar"/>
          <zipfileset src="${jboss.metadata.lib}/jboss-metadata.jar"/>
          <zipfileset src="${jboss.jboss.ejb3.cache.lib}/jboss-ejb3-cache.jar"/>
-         <zipfileset src="${jboss.jboss.ejb3.ext.api.lib}/jboss-ejb3-ext-api.jar"/>
-
+         <zipfileset src="${jboss.jboss.ejb3.ext.api.lib}/jboss-ejb3-ext-api.jar"/>
+      	 <zipfileset src="${jboss.profileservice.lib}/jboss-profileservice.jar" />
          <zipfileset src="../messaging/output/lib/jboss-messaging-int.jar"/>
       </jar>
 
@@ -450,7 +461,9 @@
          <zipfileset src="${apache.xerces.lib}/xml-apis.jar" excludes="**/license"/>
          <zipfileset src="${javassist.lib}/javassist.jar"/>
          <zipfileset src="${trove.lib}/trove.jar"/>
-         <zipfileset src="${quartz.quartz.lib}/quartz-all.jar"/>
+         <zipfileset src="${quartz.quartz.lib}/quartz-all.jar"/>
+      	 <zipfileset src="${sun.jaxb.lib}/jaxb-api.jar"/>
+      	 <zipfileset src="${sun.jaxb.lib}/jaxb-impl.jar"/>
       </jar>
    </target>
 

Modified: trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml	2007-11-30 13:15:19 UTC (rev 67655)
+++ trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml	2007-11-30 13:36:23 UTC (rev 67656)
@@ -1,28 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    JCA Deployers
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-   <bean name="JCAMetaDataRepository" class="org.jboss.resource.metadata.repository.DefaultJCAMetaDataRepository"/>
-   <!-- RAR Deployment -->
-   <bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
-      <property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
-      <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>
-      <property name="type">rar</property>
-   </bean>
-
-   <!-- ConnectionFactory Deployment   -->
-
-   <bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
-      <property name="suffix">-ds.xml</property>
-      <property name="XSLPath">stylesheets/NoJRMPConnectionFactoryTemplate.xsl</property>
-      <property name="type">jca-ds</property>
-   </bean>
-
-</deployment>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    JCA Deployers
+    $Id: jca-deployers-beans.xml 65072 2007-09-05 02:16:15Z scott.stark at jboss.org $
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <bean name="JCAMetaDataRepository" class="org.jboss.resource.metadata.repository.DefaultJCAMetaDataRepository"/>
+            
+   <!-- RAR Deployment -->
+   <bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
+      <property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
+      <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>
+      <property name="type">rar</property>
+   </bean>
+   
+   
+   
+   <!-- ConnectionFactory Deployment - ->  
+   
+   <bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
+      <property name="suffix">-ds.xml</property>
+      <property name="XSLPath">stylesheets/ConnectionFactoryTemplate.xsl</property>
+      <property name="type">jca-ds</property>
+   </bean>
+   
+   -->
+
+   <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="repository"><inject bean="JCAMetaDataRepository"></inject></property>
+      <property name="suffix">-ds.xml</property>      
+      <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">
+         <list>
+            <inject bean="MCFBuilder"/>
+            <inject bean="PoolBuilder"/>
+            <inject bean="ConnectionManagerBuilder"/>
+            <inject bean="ConnectionFactoryBindingBuilder"/>
+            <inject bean="MetaDataTypeMappingBuilder"/>            
+         </list>            
+      </property>
+      <property name="type">jca-ds</property>
+   </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>
+   <bean name="DsDataSourceTemplateInfo"
+      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>
+      </constructor>
+   </bean>
+   
+</deployment>




More information about the jboss-cvs-commits mailing list