[jboss-cvs] JBossAS SVN: r75791 - in trunk: server/src/etc/deploy and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jhalliday
Date: 2008-07-14 12:14:24 -0400 (Mon, 14 Jul 2008)
New Revision: 75791

Added:
   trunk/server/src/etc/deploy/transaction-beans.xml
Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/deploy/transaction-service.xml
Log:
Upgrade JBossTS from 4.3.0.GA to 4.4.0.CR1  JBAS-5738
--------------------------------------------
This line, and those below, will be ignored--

M    component-matrix/pom.xml
M    server/src/etc/deploy/transaction-service.xml
A    server/src/etc/deploy/transaction-beans.xml


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-07-14 16:03:14 UTC (rev 75790)
+++ trunk/component-matrix/pom.xml	2008-07-14 16:14:24 UTC (rev 75791)
@@ -30,7 +30,7 @@
   <properties>
     <version.junit>3.8.2-brew</version.junit>
     <version.jacorb>2.3.0jboss.patch5-brew</version.jacorb>
-    <version.jboss.jbossts>4.3.0.GA</version.jboss.jbossts>
+    <version.jboss.jbossts>4.4.0.CR1</version.jboss.jbossts>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.jbossws>3.0.2.GA</version.jboss.jbossws>
     <version.jboss.jbossws-common>1.0.5.GA</version.jboss.jbossws-common>

Added: trunk/server/src/etc/deploy/transaction-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-beans.xml	                        (rev 0)
+++ trunk/server/src/etc/deploy/transaction-beans.xml	2008-07-14 16:14:24 UTC (rev 75791)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <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>
+
+        <property name="transactionTimeout">300</property>
+        <property name="objectStoreDir">${jboss.server.data.dir}/tx-object-store</property>
+        <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+    </bean>
+
+</deployment>
\ No newline at end of file

Modified: trunk/server/src/etc/deploy/transaction-service.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-service.xml	2008-07-14 16:03:14 UTC (rev 75790)
+++ trunk/server/src/etc/deploy/transaction-service.xml	2008-07-14 16:14:24 UTC (rev 75791)
@@ -12,13 +12,6 @@
    <!-- Transactions                                                         -->
    <!-- ==================================================================== -->
 
-   <!-- JBossTS JTA -->
-   <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
-      name="jboss:service=TransactionManager">
-      <attribute name="TransactionTimeout">300</attribute>
-      <attribute name="ObjectStoreDir">${jboss.server.data.dir}/tx-object-store</attribute>        
-   </mbean>
-
    <!--
       | UserTransaction support. Will be replaced by the DTM once
       | the DTM is made to play nice with JBossTS.