[jboss-cvs] JBossAS SVN: r108966 - in trunk: jbossas-transactions and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 28 10:06:01 EDT 2010
Author: jhalliday
Date: 2010-10-28 10:06:01 -0400 (Thu, 28 Oct 2010)
New Revision: 108966
Modified:
trunk/component-matrix/pom.xml
trunk/jbossas-transactions/transaction-jboss-beans-for-jts.xml
trunk/server/src/etc/deploy/transaction-jboss-beans.xml
trunk/testsuite/src/main/org/jboss/test/jbossts/taskdefs/TransactionLog.java
Log:
Update JBossTS to 4.13.1 JBAS-8576
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-10-28 14:05:49 UTC (rev 108965)
+++ trunk/component-matrix/pom.xml 2010-10-28 14:06:01 UTC (rev 108966)
@@ -50,7 +50,7 @@
<version.javax.validation>1.0.0.GA</version.javax.validation>
<version.jaxws-httpserver-httpspi>1.0.0.GA</version.jaxws-httpserver-httpspi>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
- <version.jboss.jbossts>4.11.0.Final</version.jboss.jbossts>
+ <version.jboss.jbossts>4.13.1.Final</version.jboss.jbossts>
<version.jboss.jbossws-native>3.4.0.CR2</version.jboss.jbossws-native>
<version.jboss.jbossws-cxf>3.4.0.CR2</version.jboss.jbossws-cxf>
<version.jboss.jbossws-common>1.4.0.CR2</version.jboss.jbossws-common>
Modified: trunk/jbossas-transactions/transaction-jboss-beans-for-jts.xml
===================================================================
--- trunk/jbossas-transactions/transaction-jboss-beans-for-jts.xml 2010-10-28 14:05:49 UTC (rev 108965)
+++ trunk/jbossas-transactions/transaction-jboss-beans-for-jts.xml 2010-10-28 14:06:01 UTC (rev 108966)
@@ -3,23 +3,13 @@
<!--
This is an example transaction-jboss-beans.xml file suitable for installing
- JBossTS 4.11.0.Final JTS into AS 6.0 M3.
+ JBossTS 4.13.1.Final JTS into AS 6.0 M5.
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, 2010-05
+ jonathan.halliday at redhat.com, 2010-10
-->
- <bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=LoggingEnvironmentBean", exposedInterface=com.arjuna.common.internal.util.logging.LoggingEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
- <constructor factoryClass="com.arjuna.common.internal.util.logging.commonPropertyManager" factoryMethod="getLoggingEnvironmentBean"/>
-
- <property name="loggingFactory">com.arjuna.common.internal.util.logging.jakarta.JakartaRelevelingLogFactory;com.arjuna.common.internal.util.logging.jakarta.Log4JLogger</property>
-
- </bean>
-
<bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=RecoveryEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.RecoveryEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
@@ -113,20 +103,61 @@
<property name="defaultTimeout">300</property>
</bean>
- <bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+ <bean name="ActionStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=ObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=ActionStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
- <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>default</parameter>
+ </constructor>
<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 name="StateStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=StateStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>stateStore</parameter>
+ </constructor>
+
+ <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
</bean>
+ <bean name="CommunicationStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=CommunicationStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>communicationStore</parameter>
+ </constructor>
+
+ <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
+ </bean>
+
+ <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
+
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+
+ <property name="types" preinstantiate="false">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>StateManager/BasicAction/TwoPhaseCoordinator/ArjunaTransactionImple</key>
+ <value>com.arjuna.ats.arjuna.tools.osb.mbean.ActionBean</value>
+ </entry>
+ <entry>
+ <key>StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction</key>
+ <value>com.arjuna.ats.internal.jta.tools.osb.mbean.jta.JTAActionBean</value>
+ </entry>
+ </map>
+ </property>
+
+ </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>
@@ -160,8 +191,10 @@
<parameter><inject bean="jboss:service=CorbaORB" property="ORB"/></parameter>
</constructor>
- <demand state="Create">LoggingEnvironmentBean</demand>
<demand state="Create">RecoveryEnvironmentBean</demand>
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
</bean>
@@ -180,11 +213,12 @@
<parameter><inject bean="jboss:service=CorbaORB" property="ORB"/></parameter>
</start>
- <demand state="Create">LoggingEnvironmentBean</demand>
<demand state="Create">RecoveryEnvironmentBean</demand>
<demand state="Create">CoreEnvironmentBean</demand>
<demand state="Create">CoordinatorEnvironmentBean</demand>
- <demand state="Create">ObjectStoreEnvironmentBean</demand>
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
<demand state="Create">JTAEnvironmentBean</demand>
<demand>RecoveryManager</demand>
Modified: trunk/server/src/etc/deploy/transaction-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2010-10-28 14:05:49 UTC (rev 108965)
+++ trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2010-10-28 14:06:01 UTC (rev 108966)
@@ -3,24 +3,13 @@
<!--
This is an example transaction-jboss-beans.xml file suitable for installing
- JBossTS 4.11.0.Final JTA into AS 6.0 M3.
+ JBossTS 4.13.1.Final JTA into AS 6.0 M5.
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, 2010-05
+ jonathan.halliday at redhat.com, 2010-10
-->
- <bean name="LoggingEnvironmentBean" class="com.arjuna.common.internal.util.logging.LoggingEnvironmentBean">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=LoggingEnvironmentBean", exposedInterface=com.arjuna.common.internal.util.logging.LoggingEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
-
- <constructor factoryClass="com.arjuna.common.internal.util.logging.commonPropertyManager" factoryMethod="getLoggingEnvironmentBean"/>
-
- <property name="loggingFactory">com.arjuna.common.internal.util.logging.jakarta.JakartaRelevelingLogFactory;com.arjuna.common.internal.util.logging.jakarta.Log4JLogger</property>
- <!--<property name="loggingFactory">com.arjuna.ats.internal.jbossatx.logging.JBossLogFactory</property>-->
-
- </bean>
-
<bean name="RecoveryEnvironmentBean" class="com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=RecoveryEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.RecoveryEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
@@ -107,21 +96,58 @@
<property name="defaultTimeout">300</property>
</bean>
- <bean name="ObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+ <bean name="ActionStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=ObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=ActionStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>default</parameter>
+ </constructor>
- <constructor factoryClass="com.arjuna.ats.arjuna.common.arjPropertyManager" factoryMethod="getObjectStoreEnvironmentBean"/>
+ <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
+ </bean>
+ <bean name="StateStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=StateStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>stateStore</parameter>
+ </constructor>
+
<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"/>
+ <bean name="CommunicationStoreObjectStoreEnvironmentBean" class="com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean">
- <demand state="Create">ObjectStoreEnvironmentBean</demand>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.jta:name=CommunicationStoreObjectStoreEnvironmentBean", exposedInterface=com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBeanMBean.class, registerDirectly=true)</annotation>
+
+ <constructor factoryClass="com.arjuna.common.internal.util.propertyservice.BeanPopulator" factoryMethod="getNamedInstance">
+ <parameter>com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean</parameter>
+ <parameter>communicationStore</parameter>
+ </constructor>
+
+ <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
</bean>
+
+ <bean name="ObjectStoreBrowserBean" class="com.arjuna.ats.arjuna.tools.osb.mbean.ObjStoreBrowser">
+
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+
+ <property name="types" preinstantiate="false">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry>
+ <key>StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction</key>
+ <value>com.arjuna.ats.internal.jta.tools.osb.mbean.jta.JTAActionBean</value>
+ </entry>
+ </map>
+ </property>
+
+ </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>
@@ -151,8 +177,10 @@
<bean name="RecoveryManager" class="com.arjuna.ats.jbossatx.jta.RecoveryManagerService">
- <demand state="Create">LoggingEnvironmentBean</demand>
<demand state="Create">RecoveryEnvironmentBean</demand>
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
</bean>
@@ -167,11 +195,12 @@
<property name="jbossXATerminator"><inject bean="XATerminator"/></property>
<property name="transactionSynchronizationRegistry"><inject bean="TransactionSynchronizationRegistry"/></property>
- <demand state="Create">LoggingEnvironmentBean</demand>
<demand state="Create">RecoveryEnvironmentBean</demand>
<demand state="Create">CoreEnvironmentBean</demand>
<demand state="Create">CoordinatorEnvironmentBean</demand>
- <demand state="Create">ObjectStoreEnvironmentBean</demand>
+ <demand state="Create">ActionStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">StateStoreObjectStoreEnvironmentBean</demand>
+ <demand state="Create">CommunicationStoreObjectStoreEnvironmentBean</demand>
<demand state="Create">JTAEnvironmentBean</demand>
<demand>RecoveryManager</demand>
Modified: trunk/testsuite/src/main/org/jboss/test/jbossts/taskdefs/TransactionLog.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossts/taskdefs/TransactionLog.java 2010-10-28 14:05:49 UTC (rev 108965)
+++ trunk/testsuite/src/main/org/jboss/test/jbossts/taskdefs/TransactionLog.java 2010-10-28 14:06:01 UTC (rev 108966)
@@ -20,14 +20,14 @@
*/
package org.jboss.test.jbossts.taskdefs;
-import com.arjuna.ats.arjuna.objectstore.ObjectStore;
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
+import com.arjuna.ats.arjuna.objectstore.RecoveryStore;
+import com.arjuna.ats.arjuna.objectstore.StoreManager;
import com.arjuna.ats.arjuna.state.InputObjectState;
import com.arjuna.ats.arjuna.AtomicAction;
-import com.arjuna.ats.arjuna.coordinator.TxControl;
import com.arjuna.ats.internal.arjuna.common.UidHelper;
import java.util.ArrayList;
@@ -43,7 +43,7 @@
*/
public static final String DEFAULT_OBJECT_TYPE = "StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction";
- private ObjectStore store;
+ private RecoveryStore store;
public TransactionLog(String storeDir, String impleType)
{
@@ -61,7 +61,7 @@
{
Class c = Class.forName(impleType);
- store = (ObjectStore) c.newInstance();
+ store = (RecoveryStore) c.newInstance();
}
catch (final Throwable ex)
{
@@ -69,7 +69,7 @@
}
}
else
- store = TxControl.getStore();
+ store = StoreManager.getRecoveryStore();
}
/**
More information about the jboss-cvs-commits
mailing list