[jboss-cvs] JBossAS SVN: r68594 - in branches/EMBEDDED_JBOSS_BETA3/embedded: src/main/resources/javase/deployers and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 2 17:53:21 EST 2008
Author: petemuir
Date: 2008-01-02 17:53:21 -0500 (Wed, 02 Jan 2008)
New Revision: 68594
Modified:
branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml
branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/metadata-beans.xml
Log:
Changes needed for beta3
Modified: branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml 2008-01-02 22:15:38 UTC (rev 68593)
+++ branches/EMBEDDED_JBOSS_BETA3/embedded/build.xml 2008-01-02 22:53:21 UTC (rev 68594)
@@ -430,7 +430,7 @@
<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.impl.lib}/jboss-ejb3-impl-0.1.1.Beta1.jar"/>
+ <zipfileset src="${jboss.jboss.ejb3.impl.lib}/jboss-ejb3-impl.jar"/>
<zipfileset src="${jboss.ha.lib}/jboss-ha-client.jar" />
<zipfileset src="${jboss.profileservice.lib}/jboss-profileservice.jar" />
<zipfileset src="../messaging/output/lib/jboss-messaging-int.jar"/>
@@ -463,7 +463,8 @@
<zipfileset src="${trove.lib}/trove.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"/>
+ <zipfileset src="${sun.jaxb.lib}/jaxb-impl.jar"/>
+ <zipfileset src="${sun.jaf.lib}/activation.jar"/>
</jar>
</target>
@@ -487,7 +488,7 @@
<include name="**"/>
</fileset>
</javadoc>
- <property name="embedded.version" value="embedded-jboss-beta2"/>
+ <property name="embedded.version" value="embedded-jboss-beta3-SNAPSHOT"/>
<zip zipfile="${embedded.version}.zip">
<zipfileset dir="." prefix="${embedded.version}">
<include name="DOCUMENTATION.html"/>
Modified: branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml 2008-01-02 22:15:38 UTC (rev 68593)
+++ branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml 2008-01-02 22:53:21 UTC (rev 68594)
@@ -6,8 +6,10 @@
<!-- ejb-jar.xml parsing deployer -->
<bean name="Ejb2ParsingDeployer" class="org.jboss.deployment.EjbParsingDeployer">
- <property name="type">ejb2x</property>
+ <property name="type">ejb2x</property>
+ <!--
<property name="useSchemaValidation">false</property>
+ -->
<property name="relativeOrder">3000</property>
</bean>
<bean name="JBossEjb2ParsingDeployer" class="org.jboss.deployment.JBossEjbParsingDeployer">
@@ -15,6 +17,8 @@
<property name="relativeOrder">3001</property>
<property name="useSchemaValidation">false</property>
<property name="ignoreMissingStandardJBossXml">true</property>
+ <!-- Can be used to override the default location of the standardjboss.xml -->
+ <!-- ><property name="standardJBossXmlPath">${jboss.server.config.url}/standardjboss.xml</property>-->
</bean>
<bean name="EJB2xDeployer" class="org.jboss.ejb.deployers.EjbDeployer">
Modified: branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml 2008-01-02 22:15:38 UTC (rev 68593)
+++ branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml 2008-01-02 22:53:21 UTC (rev 68594)
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- JCA Deployers
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- TODO this should be removed later on when ENC gets changed -->
- <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
- <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
-
- <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
- <property name="type">ejb3x</property>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ JCA Deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- TODO this should be removed later on when ENC gets changed -->
+ <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
+ <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
+
+ <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
+ <property name="type">ejb3x</property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
<property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
<property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
@@ -30,120 +30,120 @@
Default for this value is "false".
-->
- <property name="deploymentDescriptorRequired">true</property>
-
- <property name="ignoredJarsSet">
- <set elementClass="java.lang.String">
- <value>snmp-adaptor.jar</value>
- <value>otherimages.jar</value>
- <value>applet.jar</value>
- <value>jcommon.jar</value>
- <value>console-mgr-classes.jar</value>
- <value>jfreechart.jar</value>
- <value>juddi-service.jar</value>
- <value>wsdl4j.jar</value>
- <value>commons-collections.jar</value>
- <value>commons-pool.jar</value>
- <value>juddi.jar</value>
- <value>commons-discovery.jar</value>
- <value>uddi4j.jar</value>
- <value>axis.jar</value>
- <value>commons-dbcp.jar</value>
- <value>jboss-juddiaxis.jar</value>
- <value>trove.jar</value>
- <value>javassist.jar</value>
- <value>jboss-aop-jdk50.jar</value>
- <value>jboss-aspect-library-jdk50.jar</value>
- <value>ejb3-persistence.jar</value>
- <value>commons-validator-1.1.3.jar</value>
- <value>commons-collections.jar</value>
- <value>commons-fileupload.jar</value>
- <value>commons-pool.jar</value>
- <value>hibernate-entitymanager.jar</value>
- <value>jboss-ejb3x.jar</value>
- <value>commons-digester-1.6.jar</value>
- <value>cglib-2.1.1.jar</value>
- <value>commons-discovery.jar</value>
- <value>jboss-annotations-ejb3.jar</value>
- <value>jaxen-1.1-beta-4.jar</value>
- <value>hibernate-annotations.jar</value>
- <value>commons-httpclient.jar</value>
- <value>commons-logging.jar</value>
- <value>commons-vfs.jar</value>
- <value>hibernate3.jar</value>
- <value>commons-logging-api.jar</value>
- <value>asm.jar</value>
- <value>asm-attrs.jar</value>
- <value>commons-lang-2.0.jar</value>
- <value>commons-beanutils.jar</value>
- <value>jboss-ejb3.jar</value>
- <value>dom4j.jar</value>
- <value>commons-codec-1.2.jar</value>
- <value>wsdl4j.jar</value>
- <value>xmlsec.jar</value>
- <value>jbossws.jar</value>
- <value>jboss-bean-deployer.jar</value>
- <value>jboss-microcontainer.jar</value>
- <value>jboss-dependency.jar</value>
- <value>jboss-container.jar</value>
- <value>tomcat-coyote.jar</value>
- <value>commons-collections.jar</value>
- <value>myfaces.jar</value>
- <value>jstl.jar</value>
- <value>commons-digester-1.6.jar</value>
- <value>myfaces-impl.jar</value>
- <value>commons-beanutils.jar</value>
- <value>myfaces-jsf-api.jar</value>
- <value>commons-codec-1.2.jar</value>
- <value>catalina-optional.jar</value>
- <value>tomcat-util.jar</value>
- <value>jasper-compiler.jar</value>
- <value>commons-el.jar</value>
- <value>jasper-compiler-jdt.jar</value>
- <value>tomcat-http.jar</value>
- <value>catalina-manager.jar</value>
- <value>jasper-runtime.jar</value>
- <value>tomcat55-service.jar</value>
- <value>servlets-invoker.jar</value>
- <value>catalina.jar</value>
- <value>naming-resources.jar</value>
- <value>servlets-default.jar</value>
- <value>tomcat-ajp.jar</value>
- <value>commons-modeler.jar</value>
- <value>tomcat-apr.jar</value>
- <value>servlets-webdav.jar</value>
- </set>
- </property>
- <depends>AspectLibrary</depends>
+ <property name="deploymentDescriptorRequired">false</property>
+
+ <property name="ignoredJarsSet">
+ <set elementClass="java.lang.String">
+ <value>snmp-adaptor.jar</value>
+ <value>otherimages.jar</value>
+ <value>applet.jar</value>
+ <value>jcommon.jar</value>
+ <value>console-mgr-classes.jar</value>
+ <value>jfreechart.jar</value>
+ <value>juddi-service.jar</value>
+ <value>wsdl4j.jar</value>
+ <value>commons-collections.jar</value>
+ <value>commons-pool.jar</value>
+ <value>juddi.jar</value>
+ <value>commons-discovery.jar</value>
+ <value>uddi4j.jar</value>
+ <value>axis.jar</value>
+ <value>commons-dbcp.jar</value>
+ <value>jboss-juddiaxis.jar</value>
+ <value>trove.jar</value>
+ <value>javassist.jar</value>
+ <value>jboss-aop-jdk50.jar</value>
+ <value>jboss-aspect-library-jdk50.jar</value>
+ <value>ejb3-persistence.jar</value>
+ <value>commons-validator-1.1.3.jar</value>
+ <value>commons-collections.jar</value>
+ <value>commons-fileupload.jar</value>
+ <value>commons-pool.jar</value>
+ <value>hibernate-entitymanager.jar</value>
+ <value>jboss-ejb3x.jar</value>
+ <value>commons-digester-1.6.jar</value>
+ <value>cglib-2.1.1.jar</value>
+ <value>commons-discovery.jar</value>
+ <value>jboss-annotations-ejb3.jar</value>
+ <value>jaxen-1.1-beta-4.jar</value>
+ <value>hibernate-annotations.jar</value>
+ <value>commons-httpclient.jar</value>
+ <value>commons-logging.jar</value>
+ <value>commons-vfs.jar</value>
+ <value>hibernate3.jar</value>
+ <value>commons-logging-api.jar</value>
+ <value>asm.jar</value>
+ <value>asm-attrs.jar</value>
+ <value>commons-lang-2.0.jar</value>
+ <value>commons-beanutils.jar</value>
+ <value>jboss-ejb3.jar</value>
+ <value>dom4j.jar</value>
+ <value>commons-codec-1.2.jar</value>
+ <value>wsdl4j.jar</value>
+ <value>xmlsec.jar</value>
+ <value>jbossws.jar</value>
+ <value>jboss-bean-deployer.jar</value>
+ <value>jboss-microcontainer.jar</value>
+ <value>jboss-dependency.jar</value>
+ <value>jboss-container.jar</value>
+ <value>tomcat-coyote.jar</value>
+ <value>commons-collections.jar</value>
+ <value>myfaces.jar</value>
+ <value>jstl.jar</value>
+ <value>commons-digester-1.6.jar</value>
+ <value>myfaces-impl.jar</value>
+ <value>commons-beanutils.jar</value>
+ <value>myfaces-jsf-api.jar</value>
+ <value>commons-codec-1.2.jar</value>
+ <value>catalina-optional.jar</value>
+ <value>tomcat-util.jar</value>
+ <value>jasper-compiler.jar</value>
+ <value>commons-el.jar</value>
+ <value>jasper-compiler-jdt.jar</value>
+ <value>tomcat-http.jar</value>
+ <value>catalina-manager.jar</value>
+ <value>jasper-runtime.jar</value>
+ <value>tomcat55-service.jar</value>
+ <value>servlets-invoker.jar</value>
+ <value>catalina.jar</value>
+ <value>naming-resources.jar</value>
+ <value>servlets-default.jar</value>
+ <value>tomcat-ajp.jar</value>
+ <value>commons-modeler.jar</value>
+ <value>tomcat-apr.jar</value>
+ <value>servlets-webdav.jar</value>
+ </set>
+ </property>
+ <depends>AspectLibrary</depends>
+ </bean>
+ <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
+ <depends>AspectLibrary</depends>
+ </bean>
+
+ <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
+ <property name="type">car</property>
+ <!-- TODO: check depends -->
+ <depends>AspectLibrary</depends>
+ </bean>
+
+ <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
+ <property name="type">car</property>
+ <depends>AppClientParsingDeployer</depends>
+ </bean>
+
+ <bean name="AppClientScanningDeployer" class="org.jboss.ejb3.deployers.AppClientScanningDeployer">
+ <depends>JBossClientParsingDeployer</depends>
+ </bean>
+
+ <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
+ <property name="type">car</property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <!-- TODO: check depends -->
+ <depends>AspectLibrary</depends>
+ <depends>AppClientScanningDeployer</depends>
</bean>
- <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
- <depends>AspectLibrary</depends>
- </bean>
- <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
- <property name="type">car</property>
- <!-- TODO: check depends -->
- <depends>AspectLibrary</depends>
- </bean>
-
- <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
- <property name="type">car</property>
- <depends>AppClientParsingDeployer</depends>
- </bean>
-
- <bean name="AppClientScanningDeployer" class="org.jboss.ejb3.deployers.AppClientScanningDeployer">
- <depends>JBossClientParsingDeployer</depends>
- </bean>
-
- <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
- <property name="type">car</property>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <!-- TODO: check depends -->
- <depends>AspectLibrary</depends>
- <depends>AppClientScanningDeployer</depends>
- </bean>
-
<!-- EJB3 Cache Factory Registry -->
<bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
<property name="factories">
@@ -187,7 +187,7 @@
</entry>
</map>
</property>
- </bean>
+ </bean>
<!-- Remoting Proxy Factory Registry -->
<bean name="EJB3RemoteProxyFactoryRegistry" class="org.jboss.ejb3.remoting.RemoteProxyFactoryRegistry">
@@ -248,12 +248,12 @@
</map>
</property>
</bean>
-
+
<bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
- <!-- Persistence Unit deployers -->
+ <!-- Persistence Unit deployers -->
<bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
<property name="type">car</property>
</bean>
-</deployment>
+</deployment>
Modified: branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml 2008-01-02 22:15:38 UTC (rev 68593)
+++ branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml 2008-01-02 22:53:21 UTC (rev 68594)
@@ -2,7 +2,7 @@
<!--
JCA Deployers
- $Id: jca-deployers-beans.xml 65072 2007-09-05 02:16:15Z scott.stark at jboss.org $
+ $Id: jca-deployers-beans.xml 68282 2007-12-14 13:43:52Z alex.loubyansky at jboss.com $
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
@@ -46,8 +46,7 @@
<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">
@@ -63,16 +62,60 @@
</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="DsDataSourceTemplateInfo"
+ <bean name="LocalTxDataSourceTemplateInfo"
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>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="NoTxConnectionFactoryTemplateInfo"
+ class="org.jboss.resource.deployers.management.DsDataSourceTemplateInfo">
+ <constructor>
+ <parameter>NoTxConnectionFactoryTemplate</parameter>
+ <parameter>A template for no-tx-connection-factory *-ds.xml deployments</parameter>
+ <parameter>no-tx-connection-factory</parameter>
+ </constructor>
+ </bean>
</deployment>
Modified: branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/metadata-beans.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/metadata-beans.xml 2008-01-02 22:15:38 UTC (rev 68593)
+++ branches/EMBEDDED_JBOSS_BETA3/embedded/src/main/resources/javase/deployers/metadata-beans.xml 2008-01-02 22:53:21 UTC (rev 68594)
@@ -2,7 +2,7 @@
<!--
MetaData configuration
- $Id: metadata-beans.xml,v 1.1 2007/12/04 19:31:43 pmuir Exp $
+ $Id: metadata-beans.xml 67929 2007-12-05 07:55:38Z scott.stark at jboss.org $
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
@@ -13,6 +13,7 @@
</bean>
<bean name="AnnotationMetaDataDeployer"
class="org.jboss.deployment.AnnotationMetaDataDeployer">
+ <property name="metaDataCompleteIsDefault">true</property>
</bean>
<!-- The schema location to JBossXB binding class mappings. We specify the dtd/xsd name
More information about the jboss-cvs-commits
mailing list