[jboss-cvs] JBossAS SVN: r58084 - in trunk: build server/src/etc/conf/default
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 3 14:01:26 EST 2006
Author: scott.stark at jboss.org
Date: 2006-11-03 14:01:23 -0500 (Fri, 03 Nov 2006)
New Revision: 58084
Modified:
trunk/build/build-distr.xml
trunk/server/src/etc/conf/default/jboss-service.xml
Log:
Switch to the arjuna tm as the default.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2006-11-03 18:56:30 UTC (rev 58083)
+++ trunk/build/build-distr.xml 2006-11-03 19:01:23 UTC (rev 58084)
@@ -1426,12 +1426,22 @@
value="${project.root}/${_module.name}/output"/>
<!-- Copy the generated libraries -->
- <mkdir dir="${install.server}/all/lib"/>
+ <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}"/>
Modified: trunk/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- trunk/server/src/etc/conf/default/jboss-service.xml 2006-11-03 18:56:30 UTC (rev 58083)
+++ trunk/server/src/etc/conf/default/jboss-service.xml 2006-11-03 19:01:23 UTC (rev 58084)
@@ -93,27 +93,6 @@
<attribute name="BlockingMode">run</attribute>
</mbean>
- <!-- Preload all custom editors for VMs that don't use the thread
- context class loader when searching for PropertyEditors. Uncomment
- if your JDK 1.3.0 VM fails to find JBoss PropertyEditors.
- <mbean code="org.jboss.varia.property.PropertyEditorManagerService"
- name="jboss:type=Service,name=BootstrapEditors">
- <attribute name="BootstrapEditors">
- java.math.BigDecimal=org.jboss.util.propertyeditor.BigDecimalEditor
- java.lang.Boolean=org.jboss.util.propertyeditor.BooleanEditor
- java.lang.Class=org.jboss.util.propertyeditor.ClassEditor
- java.util.Date=org.jboss.util.propertyeditor.DateEditor
- java.io.File=org.jboss.util.propertyeditor.FileEditor
- java.net.InetAddress=org.jboss.util.propertyeditor.InetAddressEditor
- java.lang.Integer=org.jboss.util.propertyeditor.IntegerEditor
- javax.management.ObjectName=org.jboss.mx.util.propertyeditor.ObjectNameEditor
- java.util.Properties=org.jboss.util.propertyeditor.PropertiesEditor
- [Ljava.lang.String;=org.jboss.util.propertyeditor.StringArrayEditor
- java.net.URL=org.jboss.util.propertyeditor.URLEditor
- </attribute>
- </mbean>
- -->
-
<!-- ==================================================================== -->
<!-- Log4j Initialization -->
<!-- ==================================================================== -->
@@ -327,56 +306,53 @@
name="jboss:service=XidFactory">
<!--attribute name="Pad">true</attribute-->
</mbean>
-
- <!-- TM Recovery
- <mbean code="org.jboss.tm.recovery.XidFactoryInitializationService"
+
+ <!-- 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">
+ </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">
+ </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>
+ </mbean>
-->
-
+
<!--
| The fast in-memory transaction manager.
- -->
- <mbean code="org.jboss.tm.TransactionManagerService"
+ | 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>
- <!-- 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-->
-
- <!-- Transaction Integrity Checking -->
- <!-- Force a rollback if another thread is associated with the transaction at commit -->
- <!--depends optional-attribute-name="TransactionIntegrityFactory"
- proxy-type="org.jboss.tm.integrity.TransactionIntegrityFactory">
- <mbean code="org.jboss.tm.integrity.FailIncompleteTransaction"
- name="jboss:service=TransactionManager,plugin=TransactionIntegrity"/>
- </depends-->
+ </mbean>
+ -->
+
+ <!-- JBossTS JTA -->
+ <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+ name="jboss:service=TransactionManager">
+ <attribute name="TransactionTimeout">300</attribute>
</mbean>
-
+
<!--
- | Old UserTransaction support.
- | Commented out as UserTransaction is now supported
- | by the distributed transaction manager (see below).
+ | UserTransaction support. Will be replaced by the DTM once
+ | the DTM is made to play nice with JBossTS.
+ -->
<mbean code="org.jboss.tm.usertx.server.ClientUserTransactionService"
name="jboss:service=ClientUserTransaction"
xmbean-dd="resource:xmdesc/ClientUserTransaction-xmbean.xml">
@@ -413,21 +389,22 @@
</mbean>
</depends>
</mbean>
- -->
-
+
<!--
| Distributed transaction manager.
| Includes support for UserTransaction over JBoss remoting.
- -->
- <mbean code="org.jboss.tm.remoting.server.DistributedTransactionManager"
- name="jboss:service=DistributedTransactionManager">
+ | Works with the old in-memory tx manager, but not JBossTS.
+ | Hence disabled for now.
+ <mbean code="org.jboss.tm.remoting.server.DistributedTransactionManager"
+ name="jboss:service=DistributedTransactionManager">
<depends>jboss:service=TransactionManager</depends>
<depends-list optional-attribute-name="Connectors">
- <depends-list-element>jboss.remoting:service=Connector,transport=socket</depends-list-element>
+ <depends-list-element>jboss.remoting:service=Connector,transport=socket</depends-list-element>
</depends-list>
<attribute name="InterpositionEnabled">false</attribute>
- </mbean>
-
+ </mbean>
+ -->
+
<!-- ==================================================================== -->
<!-- Invokers to the JMX node -->
<!-- ==================================================================== -->
More information about the jboss-cvs-commits
mailing list