[jboss-cvs] JBossAS SVN: r66033 - in trunk: connector/src/etc/example-config and 18 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 11 12:32:28 EDT 2007
Author: adrian at jboss.org
Date: 2007-10-11 12:32:28 -0400 (Thu, 11 Oct 2007)
New Revision: 66033
Removed:
trunk/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java
trunk/server/src/etc/conf/default/xmdesc/TransactionManagerService-xmbean.xml
trunk/server/src/main/org/jboss/jms/asf/
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
trunk/connector/src/etc/example-config/generic-ds.xml
trunk/connector/src/etc/example-config/hajndi-jms-ds.xml
trunk/connector/src/etc/example-config/jms-ds.xml
trunk/ejb3/.classpath
trunk/ejb3/build-test.xml
trunk/ejb3/build.xml
trunk/ejb3/src/resources/standalone/embedded-jboss-beans.xml
trunk/ejb3/src/resources/standalone/jboss-jms-beans.xml
trunk/ejb3/src/resources/test-configs/localfromremote2/conf/jboss-service.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/Tester.java
trunk/ejb3/src/test/org/jboss/ejb3/test/initial/TxTester.java
trunk/embedded/src/main/resources/javase/conf/jboss-service.xml
trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml
trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml
trunk/server/.classpath
trunk/server/build.xml
trunk/server/src/etc/conf/default/jboss-service.xml
trunk/system/src/resources/tests/conf/jboss-service-VDFDeploymentScanner.xml
trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml
trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml
trunk/testsuite/src/resources/cluster/http/jboss-service.xml
trunk/testsuite/src/resources/test-configs/jrmp-invoker/conf/jboss-service.xml
trunk/tools/etc/buildmagic/modules.ent
Log:
[JBAS-4516, JBAS-4517, JBAS-4518] - remove the old transaction from the rest of the build
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/build/build-distr.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -1454,50 +1454,6 @@
</copy>
</target>
- <!-- =========== -->
- <!-- Transaction -->
- <!-- =========== -->
-
- <target name="_module-transaction-most">
- <property name="_module.name" value="transaction" override="true"/>
- <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
-
- <!-- Copy the generated libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.server}/all/lib" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-transaction.jar"/>
- </fileset>
- </copy>
- <!-- copy binary release of JBossTS from thirdparty repo -->
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
- <include name="jbossjta.jar"/>
- <include name="jbossjta-integration.jar"/>
- <include name="jbossts-common.jar"/>
- </fileset>
- </copy>
- <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
-
- <!-- Copy the generated client libraries -->
- <mkdir dir="${install.client}"/>
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jboss-transaction-client.jar"/>
- </fileset>
- </copy>
- </target>
-
- <target name="_module-transaction-all" depends="_module-transaction-most">
- <!-- Copy the generated javadocs -->
- <mkdir dir="${install.api}/${_module.name}"/>
- <copy todir="${install.api}/${_module.name}" filtering="no">
- <fileset dir="${_module.output}/api">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
<!-- ======= -->
<!-- Console -->
<!-- ======= -->
@@ -1995,6 +1951,16 @@
</fileset>
</copy>
+ <!-- copy binary release of JBossTS from thirdparty repo -->
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
+ <include name="jbossjta.jar"/>
+ <include name="jbossjta-integration.jar"/>
+ <include name="jbossts-common.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
+
<!-- Install jbossws.sar -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
<unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native50.lib}/jbossws-native50.sar"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/build/build.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -110,7 +110,6 @@
<module name="system-jmx"/>
<module name="testsuite"/>
<module name="tomcat"/>
- <module name="transaction"/>
<module name="varia"/>
<module name="webservices"/>
@@ -128,8 +127,7 @@
</group>
<group name="basic">
- <include modules="transaction,
- security,
+ <include modules="security,
server,
deployment" />
@@ -616,18 +614,6 @@
<ant antfile="build-distr.xml" target="_module-management-all"/>
</target>
- <!-- =========== -->
- <!-- Transaction -->
- <!-- =========== -->
-
- <target name="_module-transaction-most">
- <ant antfile="build-distr.xml" target="_module-transaction-most"/>
- </target>
-
- <target name="_module-transaction-all" depends="_module-transaction-most">
- <ant antfile="build-distr.xml" target="_module-transaction-all"/>
- </target>
-
<!-- ======= -->
<!-- Console -->
<!-- ======= -->
Modified: trunk/connector/src/etc/example-config/generic-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/generic-ds.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/connector/src/etc/example-config/generic-ds.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -53,9 +53,9 @@
</local-tx-datasource>
<!-- you can include regular mbean configurations like this one -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <attribute name="Pad">true</attribute>
+ <mbean code="com.acme.Abc"
+ name="com.acme:service=Abc">
+ <attribute name="Config">true</attribute>
</mbean>
Modified: trunk/connector/src/etc/example-config/hajndi-jms-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/hajndi-jms-ds.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/connector/src/etc/example-config/hajndi-jms-ds.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -34,16 +34,6 @@
</attribute>
</mbean>
- <!-- The server session pool for Message Driven Beans -->
- <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
- name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <attribute name="PoolName">StdJMSPool</attribute>
- <attribute name="PoolFactoryClass">
- org.jboss.jms.asf.StdServerSessionPoolFactory
- </attribute>
- </mbean>
-
<!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
<tx-connection-factory>
<jndi-name>JmsXA</jndi-name>
Modified: trunk/connector/src/etc/example-config/jms-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/jms-ds.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/connector/src/etc/example-config/jms-ds.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -28,16 +28,6 @@
-->
</mbean>
- <!-- The server session pool for Message Driven Beans -->
- <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
- name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <attribute name="PoolName">StdJMSPool</attribute>
- <attribute name="PoolFactoryClass">
- org.jboss.jms.asf.StdServerSessionPoolFactory
- </attribute>
- </mbean>
-
<!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
<tx-connection-factory>
<jndi-name>JmsXA</jndi-name>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/.classpath 2007-10-11 16:32:28 UTC (rev 66033)
@@ -12,7 +12,6 @@
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="src" path="/naming"/>
<classpathentry kind="src" path="/aspects"/>
- <classpathentry kind="src" path="/transaction"/>
<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate-annotations/lib/hibernate-annotations.jar"/>
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/build-test.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -194,7 +194,6 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.naming.classpath"/>
- <path refid="jboss.transaction.classpath"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/build.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -135,7 +135,6 @@
<path refid="jboss.systemjmx.classpath"/>
<path refid="jboss.mbeans.classpath"/>
<path refid="jboss.naming.classpath"/>
- <path refid="jboss.transaction.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.security.int.classpath"/>
Deleted: trunk/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/src/main/org/jboss/ejb3/embedded/XidFactoryMBean.java 2007-10-11 16:32:28 UTC (rev 66033)
@@ -1,167 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.embedded;
-
-import javax.transaction.xa.Xid;
-import org.jboss.tm.*;
-
-/**
- * Stupid wrapper because tons of services use the XidFactoryMBean interface.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class XidFactoryMBean implements org.jboss.tm.XidFactoryMBean
-{
- private XidFactoryBase base;
-
- public XidFactoryMBean(XidFactoryBase base)
- {
- this.base = base;
- }
-
- public org.jboss.tm.XidFactoryMBean getInstance()
- {
- return this;
- }
-
- public String getName()
- {
- throw new RuntimeException("should not be called");
- }
-
- public int getState()
- {
- throw new RuntimeException("should not be called");
- }
-
- public String getStateString()
- {
- throw new RuntimeException("should not be called");
- }
-
- public void jbossInternalLifecycle(String method) throws Exception
- {
- throw new RuntimeException("should not be called");
- }
-
- public void create() throws Exception
- {
- }
-
- public void start() throws Exception
- {
- }
-
- public void stop()
- {
- }
-
- public void destroy()
- {
- }
-
- public String getBaseGlobalId()
- {
- return base.getBaseGlobalId();
- }
-
- public void setBaseGlobalId(String baseGlobalId)
- {
- base.setBaseGlobalId(baseGlobalId);
- }
-
- public long getGlobalIdNumber()
- {
- return base.getGlobalIdNumber();
- }
-
- public void setGlobalIdNumber(long globalIdNumber)
- {
- base.setGlobalIdNumber(globalIdNumber);
- }
-
- public String getBranchQualifier()
- {
- return base.getBranchQualifier();
- }
-
- public void setBranchQualifier(String branchQualifier)
- {
- base.setBranchQualifier(branchQualifier);
- }
-
- public boolean isPad()
- {
- return base.isPad();
- }
-
- public void setPad(boolean pad)
- {
- base.setPad(pad);
- }
-
- public XidImpl newXid()
- {
- return base.newXid();
- }
-
- public XidImpl newBranch(GlobalId globalId)
- {
- return base.newBranch(globalId);
- }
-
- public XidImpl newBranch(XidImpl xid, long branchIdNum)
- {
- return base.newBranch(xid, branchIdNum);
- }
-
- public XidImpl recreateXid(long localId)
- {
- return base.recreateXid(localId);
- }
-
- public XidImpl recreateXid(long localId, GlobalId globalId)
- {
- return base.recreateXid(localId, globalId);
- }
-
- public byte[] localIdToGlobalId(long localId)
- {
- return base.localIdToGlobalId(localId);
- }
-
- public long extractLocalIdFrom(byte[] globalId)
- {
- return base.extractLocalIdFrom(globalId);
- }
-
- public String getBaseBranchQualifier(byte[] branchQualifier)
- {
- return base.getBaseBranchQualifier(branchQualifier);
- }
-
- public String toString(Xid xid)
- {
- return base.toString(xid);
- }
-}
Modified: trunk/ejb3/src/resources/standalone/embedded-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/standalone/embedded-jboss-beans.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/src/resources/standalone/embedded-jboss-beans.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -26,24 +26,14 @@
<property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
</bean>
- <bean name="XidFactory" class="org.jboss.tm.XidFactoryImpl"/>
-
- <bean name="XidFactoryMBean" class="org.jboss.ejb3.embedded.XidFactoryMBean">
- <constructor>
- <parameter class="org.jboss.tm.XidFactoryBase">
- <inject bean="XidFactory"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
+ <!--bean name="TransactionManagerInitializer" class="org.jboss.tm.TransactionManagerInitializer">
<property name="xidFactory"><inject bean="XidFactory"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
</bean>
<bean name="UserTransaction" class="org.jboss.ejb3.embedded.UserTransactionImpl">
<demand>TransactionManagerInitializer</demand>
- </bean>
+ </bean-->
<bean name="UserTransactionBinding" class="org.jboss.ejb3.embedded.JndiBinder">
<property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
Modified: trunk/ejb3/src/resources/standalone/jboss-jms-beans.xml
===================================================================
--- trunk/ejb3/src/resources/standalone/jboss-jms-beans.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/src/resources/standalone/jboss-jms-beans.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -28,20 +28,6 @@
<property name="serializable">true</property>
</bean>
- <bean name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool" class="org.jboss.jms.asf.StdServerSessionPoolFactory">
- <property name="name">StdJMSPool</property>
- <property name="xidFactory"><inject bean="XidFactoryMBean"/></property>
- <property name="transactionManager"><inject bean="TransactionManager"/></property>
- </bean>
-
- <bean name="b2" class="org.jboss.ejb3.embedded.JndiBinder">
- <property name="jndiProperties"><inject bean="InitialContextProperties"/></property>
- <property name="target"><inject bean="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool"/></property>
- <property name="bindTo">java:/StdJMSPool</property>
- <property name="serializable">false</property>
- </bean>
-
-
<bean name="jboss.mq:service=PersistenceManager" class="org.jboss.mq.kernel.JDBC2PersistenceManager">
<property name="transactionManager">
<inject bean="TransactionManager"/>
Modified: trunk/ejb3/src/resources/test-configs/localfromremote2/conf/jboss-service.xml
===================================================================
--- trunk/ejb3/src/resources/test-configs/localfromremote2/conf/jboss-service.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/src/resources/test-configs/localfromremote2/conf/jboss-service.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -331,48 +331,7 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
- <!-- TM Recovery. Obsolete, use JBossTS instead.
- <mbean code="org.jboss.tm.recovery.XidFactoryInitializationService"
- name="jboss:service=XidFactoryInitializer">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <attribute name="NextTxGenerationFile">${jboss.server.data.dir}/next-tx-generation.dat</attribute>
- </mbean>
-
- <mbean code="org.jboss.tm.recovery.BatchRecoveryLoggerService" name="jboss:service=RecoveryLogger">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <depends>jboss:service=XidFactoryInitializer</depends>
- <attribute name="DirectoryList">${jboss.server.data.dir}/recovery-log</attribute>
- <attribute name="LogFileSize">5000000</attribute>
- <attribute name="HeuristicStatusLogDirectory">${jboss.server.data.dir}/heuristics-log</attribute>
- </mbean>
-
- <mbean code="org.jboss.tm.recovery.RecoveryManagerService" name="jboss:service=RecoveryManager">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
- <depends optional-attribute-name="RecoveryLogger" proxy-type="org.jboss.tm.recovery.RecoveryLoggerInstance">jboss:service=RecoveryLogger</depends>
- </mbean>
- -->
-
- <!--
- | The fast in-memory transaction manager.
- | Deprecated in 5.0. Use JBossTS JTA instead.
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
- <attribute name="TransactionTimeout">300</attribute>
- <attribute name="XARetryTimeout">60</attribute>
- <attribute name="PreparedTimeout">60</attribute>
- <attribute name="GlobalIdsEnabled">true</attribute>
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- </mbean>
- -->
-
<!-- JBossTS JTA -->
<mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
name="jboss:service=TransactionManager">
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/Tester.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/Tester.java 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/asynchronous/Tester.java 2007-10-11 16:32:28 UTC (rev 66033)
@@ -24,7 +24,7 @@
import org.jboss.aspects.asynch.AsynchProvider;
import org.jboss.aspects.asynch.Future;
import org.jboss.ejb3.JBossProxy;
-import org.jboss.tm.TransactionManagerService;
+import org.jboss.tm.TransactionManagerLocator;
import javax.naming.InitialContext;
import javax.naming.Context;
@@ -98,7 +98,7 @@
TxSessionLocal tester = (TxSessionLocal) ctx.lookup("TxSessionBean/local");
TxSessionLocal asynchTester = (TxSessionLocal)((JBossProxy)tester).getAsynchronousProxy();
AsynchProvider ap = (AsynchProvider) asynchTester;
- TransactionManager tx = (TransactionManager) ctx.lookup(TransactionManagerService.JNDI_NAME);
+ TransactionManager tx = TransactionManagerLocator.locateTransactionManager();
//Add some entries in different threads and commit
tx.begin();
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/initial/TxTester.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/initial/TxTester.java 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/initial/TxTester.java 2007-10-11 16:32:28 UTC (rev 66033)
@@ -21,12 +21,12 @@
*/
package org.jboss.ejb3.test.initial;
-import org.jboss.tm.TransactionManagerService;
-
import javax.naming.InitialContext;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
+import org.jboss.tm.TransactionManagerLocator;
+
/**
* Comment
*
@@ -38,7 +38,7 @@
public void testTransactions() throws Exception
{
InitialContext ctx = new InitialContext();
- TransactionManager tm = (TransactionManager) ctx.lookup(TransactionManagerService.JNDI_NAME);
+ TransactionManager tm = TransactionManagerLocator.locateTransactionManager();
TestLocal test = (TestLocal) ctx.lookup("TestBean/local");
callNever(tm, test);
callNotSupported(tm, test);
Modified: trunk/embedded/src/main/resources/javase/conf/jboss-service.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/jboss-service.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/embedded/src/main/resources/javase/conf/jboss-service.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -84,27 +84,7 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
-
- <!--
- | The fast in-memory transaction manager.
- | Deprecated in 5.0. Use JBossTS JTA instead.
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
- <attribute name="TransactionTimeout">300</attribute>
- <attribute name="XARetryTimeout">60</attribute>
- <attribute name="PreparedTimeout">60</attribute>
- <attribute name="GlobalIdsEnabled">true</attribute>
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- </mbean>
- -->
-
<!-- JBossTS JTA -->
<mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
name="jboss:service=TransactionManager">
Modified: trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml
===================================================================
--- trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/jbossmq/src/etc/server/examples/deploy/standalone/jboss-service.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -60,21 +60,11 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
- <!--
- | The fast in-memory transaction manager.
- -->
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+ <!-- JBossTS JTA -->
+ <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+ name="jboss:service=TransactionManager">
<attribute name="TransactionTimeout">300</attribute>
-
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
</mbean>
<!-- ==================================================================== -->
Modified: trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml
===================================================================
--- trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/messaging/src/etc/deploy/non-clustered/jms-ds.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -20,13 +20,6 @@
<attribute name="TopicFactoryRef">java:/XAConnectionFactory</attribute>
</mbean>
- <mbean code="org.jboss.jms.asf.ServerSessionPoolLoader"
- name="jboss.messaging:service=ServerSessionPoolMBean,name=StdJMSPool">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <attribute name="PoolName">StdJMSPool</attribute>
- <attribute name="PoolFactoryClass">org.jboss.jms.asf.StdServerSessionPoolFactory</attribute>
- </mbean>
-
<!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
<tx-connection-factory>
<jndi-name>JmsXA</jndi-name>
Modified: trunk/server/.classpath
===================================================================
--- trunk/server/.classpath 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/server/.classpath 2007-10-11 16:32:28 UTC (rev 66033)
@@ -25,7 +25,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate-entitymanager/lib/ejb3-persistence.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
- <classpathentry combineaccessrules="false" kind="src" path="/transaction"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-container-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxrpc.jar"/>
Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/server/build.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -117,7 +117,6 @@
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.security.int.classpath"/>
- <path refid="jboss.transaction.classpath"/>
</path>
<!-- ===== -->
Modified: trunk/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-service.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/server/src/etc/conf/default/jboss-service.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -331,48 +331,7 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
- <!-- TM Recovery. Obsolete, use JBossTS instead.
- <mbean code="org.jboss.tm.recovery.XidFactoryInitializationService"
- name="jboss:service=XidFactoryInitializer">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <attribute name="NextTxGenerationFile">${jboss.server.data.dir}/next-tx-generation.dat</attribute>
- </mbean>
-
- <mbean code="org.jboss.tm.recovery.BatchRecoveryLoggerService" name="jboss:service=RecoveryLogger">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <depends>jboss:service=XidFactoryInitializer</depends>
- <attribute name="DirectoryList">${jboss.server.data.dir}/recovery-log</attribute>
- <attribute name="LogFileSize">5000000</attribute>
- <attribute name="HeuristicStatusLogDirectory">${jboss.server.data.dir}/heuristics-log</attribute>
- </mbean>
-
- <mbean code="org.jboss.tm.recovery.RecoveryManagerService" name="jboss:service=RecoveryManager">
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
- <depends optional-attribute-name="RecoveryLogger" proxy-type="org.jboss.tm.recovery.RecoveryLoggerInstance">jboss:service=RecoveryLogger</depends>
- </mbean>
- -->
-
- <!--
- | The fast in-memory transaction manager.
- | Deprecated in 5.0. Use JBossTS JTA instead.
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
- <attribute name="TransactionTimeout">300</attribute>
- <attribute name="XARetryTimeout">60</attribute>
- <attribute name="PreparedTimeout">60</attribute>
- <attribute name="GlobalIdsEnabled">true</attribute>
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- </mbean>
- -->
-
<!-- JBossTS JTA -->
<mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
name="jboss:service=TransactionManager">
Deleted: trunk/server/src/etc/conf/default/xmdesc/TransactionManagerService-xmbean.xml
===================================================================
--- trunk/server/src/etc/conf/default/xmdesc/TransactionManagerService-xmbean.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/server/src/etc/conf/default/xmdesc/TransactionManagerService-xmbean.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mbean PUBLIC
- "-//JBoss//DTD JBOSS XMBEAN 1.1//EN"
- "http://www.jboss.org/j2ee/dtd/jboss_xmbean_1_1.dtd">
-
-<!-- $Id$ -->
-<mbean>
- <description>TransactionManager Service.</description>
- <class>org.jboss.tm.TransactionManagerService</class>
- &defaultAttributes;
- <attribute access="read-write" getMethod="getGlobalIdsEnabled" setMethod="setGlobalIdsEnabled">
- <description>Should be set to true for transaction demarcation over IIOP</description>
- <name>GlobalIdsEnabled</name>
- <type>boolean</type>
- </attribute>
- <attribute access="read-write" getMethod="isInterruptThreads" setMethod="setInterruptThreads">
- <description>Whether to interrupt threads at transaction timeout</description>
- <name>InterruptThreads</name>
- <type>boolean</type>
- </attribute>
- <attribute access="read-write" getMethod="getTransactionTimeout" setMethod="setTransactionTimeout">
- <description>The transaction timeout in seconds</description>
- <name>TransactionTimeout</name>
- <type>int</type>
- </attribute>
- <attribute access="read-write" getMethod="getXARetryTimeout" setMethod="setXARetryTimeout">
- <description>The timeout in seconds for retrying operations on XA resources</description>
- <name>XARetryTimeout</name>
- <type>int</type>
- </attribute>
- <attribute access="read-write" getMethod="getPreparedTimeout" setMethod="setPreparedTimeout">
- <description>The timeout in seconds before a prepared transactions contacts its coordinator</description>
- <name>PreparedTimeout</name>
- <type>int</type>
- </attribute>
- <attribute access="read-write" getMethod="getXidFactory" setMethod="setXidFactory">
- <description>Name of the xidFactory</description>
- <name>XidFactory</name>
- <type>javax.management.ObjectName</type>
- </attribute>
- <attribute access="write-only" setMethod="setRecoveryLogger">
- <description>Recovery Logger</description>
- <name>RecoveryLogger</name>
- <type>org.jboss.tm.recovery.RecoveryLoggerInstance</type>
- </attribute>
- <attribute access="write-only" setMethod="setTransactionIntegrityFactory">
- <description>Transaction Integrity Policy</description>
- <name>TransactionIntegrityFactory</name>
- <type>org.jboss.tm.integrity.TransactionIntegrityFactory</type>
- </attribute>
- <attribute access="read-only" getMethod="getTransactionManager">
- <description>Returns the TransactionManager managed by this service</description>
- <name>TransactionManager</name>
- <type>javax.transaction.TransactionManager</type>
- </attribute>
- <attribute access="read-only" getMethod="getXATerminator">
- <description>Returns the XATerminator managed by this service</description>
- <name>XATerminator</name>
- <type>org.jboss.tm.JBossXATerminator</type>
- </attribute>
- <attribute access="read-only" getMethod="getTransactionCount">
- <description>Counts the number of active transactions</description>
- <name>TransactionCount</name>
- <type>long</type>
- </attribute>
- <attribute access="read-only" getMethod="getCommitCount">
- <description>Counts the number of commited transactions</description>
- <name>CommitCount</name>
- <type>long</type>
- </attribute>
- <attribute access="read-only" getMethod="getRollbackCount">
- <description>Counts the number of transactions that have been rolled back</description>
- <name>RollbackCount</name>
- <type>long</type>
- </attribute>
-
- <operation>
- <description>Register a XAException Formatter</description>
- <name>registerXAExceptionFormatter</name>
- <parameter>
- <description>The class of the formatter</description>
- <name>clazz</name>
- <type>java.lang.Class</type>
- </parameter>
- <parameter>
- <description>A XAExceptionFromatter value</description>
- <name>formatter</name>
- <type>org.jboss.tm.XAExceptionFormatter</type>
- </parameter>
- <return-type>void</return-type>
- </operation>
- <operation>
- <description>Unregister a XAException Formatter</description>
- <name>unregisterXAExceptionFormatter</name>
- <parameter>
- <description>The class of the formatter</description>
- <name>clazz</name>
- <type>java.lang.Class</type>
- </parameter>
- <return-type>void</return-type>
- </operation>
-
- &defaultOperations;
- </mbean>
\ No newline at end of file
Modified: trunk/system/src/resources/tests/conf/jboss-service-VDFDeploymentScanner.xml
===================================================================
--- trunk/system/src/resources/tests/conf/jboss-service-VDFDeploymentScanner.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/system/src/resources/tests/conf/jboss-service-VDFDeploymentScanner.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -239,34 +239,11 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
- <!-- TM Recovery
- <mbean code="org.jboss.tm.recovery.BatchRecoveryLoggerService" name="jboss:service=RecoveryLogger">
- <attribute name="DirectoryList">${jboss.server.data.dir}/recovery-log</attribute>
- <attribute name="MaxLogSize">100000</attribute>
- </mbean>
-
- <mbean code="org.jboss.tm.recovery.RecoveryManagerService" name="jboss:service=RecoveryManager">
- <depends optional-attribute-name="RecoveryLogger" proxy-type="org.jboss.tm.recovery.RecoveryLoggerInstance">jboss:service=RecoveryLogger</depends>
- </mbean>
- -->
-
- <!--
- | The fast in-memory transaction manager.
- -->
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+ <!-- JBossTS JTA -->
+ <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+ name="jboss:service=TransactionManager">
<attribute name="TransactionTimeout">300</attribute>
- <!-- set to false to disable transaction demarcation over IIOP -->
- <attribute name="GlobalIdsEnabled">true</attribute>
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <!-- depends optional-attribute-name="RecoveryLogger" proxy-type="org.jboss.tm.recovery.RecoveryLoggerInstance">jboss:service=RecoveryLogger</depends-->
</mbean>
<!--
Modified: trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml
===================================================================
--- trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench1.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -233,23 +233,13 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
- <!--
- | The fast in-memory transaction manager.
- -->
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+ <!-- JBossTS JTA -->
+ <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+ name="jboss:service=TransactionManager">
<attribute name="TransactionTimeout">300</attribute>
- <!-- set to false to disable transaction demarcation over IIOP -->
- <attribute name="GlobalIdsEnabled">true</attribute>
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
</mbean>
+
<!--
| UserTransaction support.
-->
Modified: trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml
===================================================================
--- trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/testsuite/src/etc/cluster-harness/conf/jboss-service-bench2.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -235,23 +235,13 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
-
- <!--
- | The fast in-memory transaction manager.
- -->
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+
+ <!-- JBossTS JTA -->
+ <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+ name="jboss:service=TransactionManager">
<attribute name="TransactionTimeout">300</attribute>
- <!-- set to false to disable transaction demarcation over IIOP -->
- <attribute name="GlobalIdsEnabled">true</attribute>
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
</mbean>
+
<!--
| UserTransaction support.
-->
Modified: trunk/testsuite/src/resources/cluster/http/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/http/jboss-service.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/testsuite/src/resources/cluster/http/jboss-service.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -173,21 +173,11 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
- <!--
- | The fast in-memory transaction manager.
- -->
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+ <!-- JBossTS JTA -->
+ <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+ name="jboss:service=TransactionManager">
<attribute name="TransactionTimeout">300</attribute>
-
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
</mbean>
<!--
Modified: trunk/testsuite/src/resources/test-configs/jrmp-invoker/conf/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jrmp-invoker/conf/jboss-service.xml 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/testsuite/src/resources/test-configs/jrmp-invoker/conf/jboss-service.xml 2007-10-11 16:32:28 UTC (rev 66033)
@@ -237,34 +237,11 @@
<!-- ==================================================================== -->
<!-- Transactions -->
<!-- ==================================================================== -->
- <!-- The configurable Xid factory. For use with Oracle, set pad to true -->
- <mbean code="org.jboss.tm.XidFactory"
- name="jboss:service=XidFactory">
- <!--attribute name="Pad">true</attribute-->
- </mbean>
- <!-- TM Recovery
- <mbean code="org.jboss.tm.recovery.BatchRecoveryLoggerService" name="jboss:service=RecoveryLogger">
- <attribute name="DirectoryList">${jboss.server.data.dir}/recovery-log</attribute>
- <attribute name="MaxLogSize">100000</attribute>
- </mbean>
-
- <mbean code="org.jboss.tm.recovery.RecoveryManagerService" name="jboss:service=RecoveryManager">
- <depends optional-attribute-name="RecoveryLogger" proxy-type="org.jboss.tm.recovery.RecoveryLoggerInstance">jboss:service=RecoveryLogger</depends>
- </mbean>
- -->
-
- <!--
- | The fast in-memory transaction manager.
- -->
- <mbean code="org.jboss.tm.TransactionManagerService"
- name="jboss:service=TransactionManager"
- xmbean-dd="resource:xmdesc/TransactionManagerService-xmbean.xml">
+ <!-- JBossTS JTA -->
+ <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+ name="jboss:service=TransactionManager">
<attribute name="TransactionTimeout">300</attribute>
- <!-- set to false to disable transaction demarcation over IIOP -->
- <attribute name="GlobalIdsEnabled">true</attribute>
- <depends optional-attribute-name="XidFactory">jboss:service=XidFactory</depends>
- <!-- depends optional-attribute-name="RecoveryLogger" proxy-type="org.jboss.tm.recovery.RecoveryLoggerInstance">jboss:service=RecoveryLogger</depends-->
</mbean>
<!--
Modified: trunk/tools/etc/buildmagic/modules.ent
===================================================================
--- trunk/tools/etc/buildmagic/modules.ent 2007-10-11 16:07:41 UTC (rev 66032)
+++ trunk/tools/etc/buildmagic/modules.ent 2007-10-11 16:32:28 UTC (rev 66033)
@@ -192,13 +192,6 @@
<pathelement path="${jboss.test.lib}/jboss-test.jar"/>
</path>
-<!-- Transaction -->
-<property name="jboss.transaction.root" value="${project.root}/transaction/output"/>
-<property name="jboss.transaction.lib" value="${jboss.transaction.root}/lib"/>
-<path id="jboss.transaction.classpath">
- <pathelement path="${jboss.transaction.lib}/jboss-transaction.jar"/>
-</path>
-
<!-- Varia -->
<property name="jboss.varia.root" value="${project.root}/varia/output"/>
<property name="jboss.varia.lib" value="${jboss.varia.root}/lib"/>
More information about the jboss-cvs-commits
mailing list