[jboss-cvs] JBossAS SVN: r104879 - in trunk: component-matrix and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 17 14:03:07 EDT 2010
Author: jhalliday
Date: 2010-05-17 14:03:06 -0400 (Mon, 17 May 2010)
New Revision: 104879
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/depchain/pom.xml
trunk/iiop/pom.xml
trunk/jbossas-transactions/transaction-jboss-beans-for-jts.xml
trunk/server/src/etc/deploy/transaction-jboss-beans.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/config/tests-crash-recovery.xml
trunk/testsuite/imports/config/tests-jts-propagation.xml
Log:
Update JBossTS component to version 4.11.0.Final JBAS-8031
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/build/build.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -2002,8 +2002,8 @@
<fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
<fileset refid="org.jboss.naming:jnpserver:jar"/>
- <fileset refid="jboss.jbossts:jbossjts:jar"/>
- <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts-integration:jar"/>
<fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
<fileset refid="org.jboss.marshalling:jboss-marshalling:jar"/>
<fileset refid="org.jboss.marshalling:jboss-marshalling-river:jar"/>
@@ -2346,8 +2346,8 @@
<!-- in in JTS mode the client needs some impl classes to make ClientUserTransaction work -->
<copy todir="${install.client}" filtering="no">
- <fileset refid="jboss.jbossts:jbossjts:jar"/>
- <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts-integration:jar"/>
<mapper refid="remove-versions" />
</copy>
@@ -2360,12 +2360,12 @@
<mkdir dir="${install.examples}/transactions"/>
<copy todir="${install.examples}/transactions" filtering="no">
- <fileset refid="jboss.jbossts:jbossts-tools:sar"/>
+ <fileset refid="org.jboss.jbossts:jbossts-tools:sar"/>
<mapper refid="remove-versions" />
</copy>
<copy todir="${install.examples}/transactions" filtering="no">
- <fileset refid="jboss.jbossts:jbossxts:sar"/>
+ <fileset refid="org.jboss.jbossts:jbossxts:sar"/>
<mapper refid="remove-versions" />
</copy>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/component-matrix/pom.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -47,7 +47,7 @@
<version.jaxrpc.api>1.1</version.jaxrpc.api>
<version.jaxws.api>2.2</version.jaxws.api>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
- <version.jboss.jbossts>4.9.0.GA</version.jboss.jbossts>
+ <version.jboss.jbossts>4.11.0.Final</version.jboss.jbossts>
<version.jboss.jbossws>3.3.0.CR2</version.jboss.jbossws>
<version.jboss.jbossws-common>1.3.0.CR3</version.jboss.jbossws-common>
<version.jboss.jbossws-framework>3.3.0.CR2</version.jboss.jbossws-framework>
@@ -1022,26 +1022,26 @@
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjts</artifactId>
<version>${version.jboss.jbossts}</version>
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjts-integration</artifactId>
<version>${version.jboss.jbossts}</version>
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossts-tools</artifactId>
<version>${version.jboss.jbossts}</version>
<type>sar</type>
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossxts</artifactId>
<version>${version.jboss.jbossts}</version>
<type>sar</type>
Modified: trunk/depchain/pom.xml
===================================================================
--- trunk/depchain/pom.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/depchain/pom.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -326,24 +326,64 @@
<artifactId>jboss-jaxb-intros</artifactId>
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjts</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjts-integration</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossts-tools</artifactId>
<type>sar</type>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossxts</artifactId>
<type>sar</type>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/iiop/pom.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -132,8 +132,18 @@
</dependency>
<dependency>
- <groupId>jboss.jbossts</groupId>
+ <groupId>org.jboss.jbossts</groupId>
<artifactId>jbossjts</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: trunk/jbossas-transactions/transaction-jboss-beans-for-jts.xml
===================================================================
--- trunk/jbossas-transactions/transaction-jboss-beans-for-jts.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/jbossas-transactions/transaction-jboss-beans-for-jts.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -3,11 +3,11 @@
<!--
This is an example transaction-jboss-beans.xml file suitable for installing
- JBossTS 4.9 JTS into AS 6.0 alpha.
+ JBossTS 4.11.0.Final JTS into AS 6.0 M3.
You need a different version of this file for JTA mode.
You don't need a jbossts-properties.xml in the AS anymore, it's all done by the beans below.
- jonathan.halliday at redhat.com, 2009-09
+ jonathan.halliday at redhat.com, 2010-05
-->
<bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
@@ -99,6 +99,8 @@
<property name="nodeIdentifier">1</property>
+ <property name="socketProcessIdMaxPorts">10</property>
+
</bean>
<bean name="CoordinatorEnvironmentBean" class="com.arjuna.ats.arjuna.common.CoordinatorEnvironmentBean">
@@ -120,6 +122,11 @@
<property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
</bean>
+ <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
+ <constructor factoryClass="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean" factoryMethod="getObjectStoreBrowserBean"/>
+ <demand state="Create">ObjectStoreEnvironmentBean</demand>
+ </bean>
+
<bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=JTAEnvironmentBean", exposedInterface=com.arjuna.ats.jta.common.JTAEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
@@ -128,9 +135,9 @@
<property name="lastResourceOptimisationInterface">org.jboss.tm.LastResource</property>
- <property name="jtaTMImplementation">com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate</property>
- <property name="jtaUTImplementation">com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple</property>
- <property name="jtaTSRImplementation">com.arjuna.ats.internal.jta.transaction.jts.TransactionSynchronizationRegistryImple</property>
+ <property name="transactionManagerClassName">com.arjuna.ats.jbossatx.jts.TransactionManagerDelegate</property>
+ <property name="userTransactionClassName">com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple</property>
+ <property name="transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.jts.TransactionSynchronizationRegistryImple</property>
<property name="xaRecoveryNodes" preinstantiate="false">
<list elementClass="java.lang.String">
@@ -138,6 +145,13 @@
</list>
</property>
+ <property name="xaResourceOrphanFilterClassNames" preinstantiate="false">
+ <list elementClass="java.lang.String">
+ <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter</value>
+ <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter</value>
+ </list>
+ </property>
+
</bean>
<bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jts.RecoveryManagerService">
@@ -161,9 +175,9 @@
<property name="jbossXATerminator"><inject bean="XATerminator"/></property>
<property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
-
+
<start>
- <parameter><inject bean="jboss:service=CorbaORB" property="ORB"/></parameter>
+ <parameter><inject bean="jboss:service=CorbaORB" property="ORB"/></parameter>
</start>
<demand state="Create">LoggingEnvironmentBean</demand>
@@ -186,6 +200,7 @@
<bean name="TransactionStatistics" class="com.arjuna.ats.arjuna.coordinator.TxStats">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=TransactionStatistics", exposedInterface=com.arjuna.ats.arjuna.coordinator.TxStatsMBean.class, registerDirectly=true)</annotation>
+ <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionStatistics",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.arjuna.coordinator.TxStatsMBean.class)</annotation>
<constructor factoryClass="com.arjuna.ats.arjuna.coordinator.TxStats" factoryMethod="getInstance"/>
</bean>
@@ -194,10 +209,10 @@
<property name="bindName">java:/TransactionManager</property>
<property name="className">
- <inject bean="JTAEnvironmentBean" property="jtaTMImplementation"/>
+ <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
</property>
<property name="factory">
- <inject bean="JTAEnvironmentBean" property="jtaTMImplementation"/>
+ <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
</property>
<install method="bind"/>
@@ -209,10 +224,10 @@
<!-- It's the job of individual components (EJB3, web, etc) to copy the ref to the java:/comp space) -->
<property name="bindName">java:/TransactionSynchronizationRegistry</property>
<property name="className">
- <inject bean="JTAEnvironmentBean" property="jtaTSRImplementation"/>
+ <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
</property>
<property name="factory">
- <inject bean="JTAEnvironmentBean" property="jtaTSRImplementation"/>
+ <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
</property>
<install method="bind"/>
@@ -242,12 +257,11 @@
<!-- Ensure TransactionPropagationContextUtil's ref to TransactionPropagationContextFactory is set. See JBAS-7784. -->
<bean name="TransactionPropagationContextFactory" class="org.jboss.tm.TransactionPropagationContextFactory">
- <constructor factoryClass="org.jboss.tm.TransactionPropagationContextUtil" factoryMethod="getTPCFactory"/>
- <!-- The factory method looks up the JNDI binding, so we depend on it -->
- <depends>TransactionPropagationContextExporterJNDIBinding</depends>
+ <constructor factoryClass="org.jboss.tm.TransactionPropagationContextUtil" factoryMethod="getTPCFactory"/>
+ <!-- The factory method looks up the JNDI binding, so we depend on it -->
+ <depends>TransactionPropagationContextExporterJNDIBinding</depends>
</bean>
-
<!-- Make javax.transaction.TransactionManager available for injection -->
<bean name="RealTransactionManager">
<constructor factoryMethod="getTransactionManager">
Modified: trunk/server/src/etc/deploy/transaction-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -3,11 +3,11 @@
<!--
This is an example transaction-jboss-beans.xml file suitable for installing
- JBossTS 4.9 JTA into AS 6.0 alpha.
+ JBossTS 4.11.0.Final JTA into AS 6.0 M3.
You need a different version of this file for JTS mode (try docs/examples/transactions/).
You don't need a jbossts-properties.xml in the AS anymore, it's all done by the beans below.
- jonathan.halliday at redhat.com, 2009-09
+ jonathan.halliday at redhat.com, 2010-05
-->
<bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
@@ -92,7 +92,7 @@
</property>
<property name="nodeIdentifier">1</property>
-
+
<property name="socketProcessIdMaxPorts">10</property>
</bean>
@@ -116,6 +116,12 @@
<property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
</bean>
+ <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean">
+ <constructor factoryClass="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBean" factoryMethod="getObjectStoreBrowserBean"/>
+
+ <demand state="Create">ObjectStoreEnvironmentBean</demand>
+ </bean>
+
<bean name="JTAEnvironmentBean" class="com.arjuna.ats.jta.common.JTAEnvironmentBean">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=JTAEnvironmentBean", exposedInterface=com.arjuna.ats.jta.common.JTAEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
@@ -124,16 +130,23 @@
<property name="lastResourceOptimisationInterface">org.jboss.tm.LastResource</property>
- <property name="jtaTMImplementation">com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate</property>
- <property name="jtaUTImplementation">com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple</property>
- <property name="jtaTSRImplementation">com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple</property>
+ <property name="transactionManagerClassName">com.arjuna.ats.jbossatx.jta.TransactionManagerDelegate</property>
+ <property name="userTransactionClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple</property>
+ <property name="transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple</property>
<property name="xaRecoveryNodes" preinstantiate="false">
<list elementClass="java.lang.String">
<value>1</value>
</list>
</property>
-
+
+ <property name="xaResourceOrphanFilterClassNames" preinstantiate="false">
+ <list elementClass="java.lang.String">
+ <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter</value>
+ <value>com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter</value>
+ </list>
+ </property>
+
</bean>
<bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
@@ -149,6 +162,7 @@
<bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jta.TransactionManagerService">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=TransactionManager", exposedInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class, registerDirectly=true)</annotation>
+ <annotation>@org.jboss.managed.api.annotation.ManagementObject(name="TransactionManager",componentType=@org.jboss.managed.api.annotation.ManagementComponent(type = "MCBean", subtype = "JTA"),targetInterface=com.arjuna.ats.jbossatx.jta.TransactionManagerServiceMBean.class)</annotation>
<property name="jbossXATerminator"><inject bean="XATerminator"/></property>
<property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
@@ -182,10 +196,10 @@
<property name="bindName">java:/TransactionManager</property>
<property name="className">
- <inject bean="JTAEnvironmentBean" property="jtaTMImplementation"/>
+ <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
</property>
<property name="factory">
- <inject bean="JTAEnvironmentBean" property="jtaTMImplementation"/>
+ <inject bean="JTAEnvironmentBean" property="transactionManagerClassName"/>
</property>
<install method="bind"/>
@@ -197,10 +211,10 @@
<!-- It's the job of individual components (EJB3, web, etc) to copy the ref to the java:/comp space) -->
<property name="bindName">java:/TransactionSynchronizationRegistry</property>
<property name="className">
- <inject bean="JTAEnvironmentBean" property="jtaTSRImplementation"/>
+ <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
</property>
<property name="factory">
- <inject bean="JTAEnvironmentBean" property="jtaTSRImplementation"/>
+ <inject bean="JTAEnvironmentBean" property="transactionSynchronizationRegistryClassName"/>
</property>
<install method="bind"/>
@@ -246,9 +260,9 @@
<bean name="UserTransactionRegistry" class="org.jboss.tm.usertx.UserTransactionRegistry">
<!-- Register providers -->
<incallback method="addProvider"/>
+ <uncallback method="removeProvider"/>
<!-- Register listeners -->
<incallback method="addListener"/>
- <uncallback method="removeProvider"/>
<uncallback method="removeListener"/>
</bean>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/testsuite/build.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -367,8 +367,8 @@
<!-- needed for jbossts crash recovery tests -->
<fileset refid="org.jboss.jbossas:jboss-server-manager:jar"/>
- <fileset refid="jboss.jbossts:jbossjts:jar"/>
- <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts-integration:jar"/>
</path>
Modified: trunk/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- trunk/testsuite/imports/config/tests-crash-recovery.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/testsuite/imports/config/tests-crash-recovery.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -68,8 +68,8 @@
<fileset refid="org.apache.ant:ant-junit:jar"/>
<fileset refid="junit:junit:jar"/>
<fileset refid="org.jboss.jbossas:jboss-server-manager:jar"/>
- <fileset refid="jboss.jbossts:jbossjts:jar"/>
- <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts-integration:jar"/>
<fileset dir="${jbosstest.dist}/client"/>
</classpath>
<sysproperty key="ant.home" value="${ant.home}"/>
Modified: trunk/testsuite/imports/config/tests-jts-propagation.xml
===================================================================
--- trunk/testsuite/imports/config/tests-jts-propagation.xml 2010-05-17 17:23:29 UTC (rev 104878)
+++ trunk/testsuite/imports/config/tests-jts-propagation.xml 2010-05-17 18:03:06 UTC (rev 104879)
@@ -69,8 +69,8 @@
<fileset refid="org.apache.ant:ant-junit:jar"/>
<fileset refid="junit:junit:jar"/>
<fileset refid="org.jboss.jbossas:jboss-server-manager:jar"/>
- <fileset refid="jboss.jbossts:jbossjts:jar"/>
- <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts:jar"/>
+ <fileset refid="org.jboss.jbossts:jbossjts-integration:jar"/>
</classpath>
<sysproperty key="ant.home" value="${ant.home}"/>
<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
More information about the jboss-cvs-commits
mailing list