[jboss-cvs] JBossAS SVN: r90246 - in trunk: build and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 16 06:43:21 EDT 2009
Author: jhalliday
Date: 2009-06-16 06:43:20 -0400 (Tue, 16 Jun 2009)
New Revision: 90246
Added:
trunk/jbossas-transactions/
Removed:
trunk/jbossas-jts/
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/jbossas-transactions/README.txt
trunk/jbossas-transactions/build.xml
trunk/thirdparty/pom.xml
Log:
Upgrade JBossTS to 4.6.1.GA. JBAS-7022
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-06-16 09:43:19 UTC (rev 90245)
+++ trunk/build/build.xml 2009-06-16 10:43:20 UTC (rev 90246)
@@ -440,6 +440,8 @@
<include name="jboss-deployers-core-spi.jar"/>
<include name="jboss-deployers-client.jar"/>
<include name="jboss-deployers-client-spi.jar"/>
+ <include name="jbossjts.jar"/>
+ <include name="jbossjts-integration.jar"/>
<!-- client excludes -->
<exclude name="jbossws-native-client.jar"/>
<exclude name="${jbossall.client.filename}"/>
@@ -1973,8 +1975,9 @@
<fileset refid="org.jboss.javaee:jboss-jaspi-api:jar"/>
<fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
<fileset refid="org.jboss.naming:jnpserver:jar"/>
- <fileset refid="jboss.jbossts:jbossjta:jar"/>
- <fileset refid="jboss.jbossts:jbossjta-integration:jar"/>
+ <fileset refid="jboss.jbossts:jbossjts:jar"/>
+ <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
+ <fileset refid="jboss.jbossts:jbossjts-jacorb:jar"/>
<fileset refid="jboss.jbossts:jbossts-common:jar"/>
<fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
<fileset refid="jboss:jboss-serialization:jar"/>
@@ -2210,8 +2213,16 @@
</patternset>
</unzip>
- <copy todir="${install.all.conf}" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjta-properties.xml"/>
+ <copy tofile="${install.all.conf}/jbossts-properties.xml" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossts-properties.xml-forJTA"/>
+ <!-- in in JTS mode the client needs some impl classes to make ClientUserTransaction work -->
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
+ <include name="jbossjts.jar"/>
+ <include name="jbossjts-integration.jar"/>
+ </fileset>
+ </copy>
+
<unzip src="${jacorb:resources:jar}" dest="${install.all.conf}">
<patternset>
<include name="resources/jacorb.properties"/>
@@ -2219,24 +2230,18 @@
<mapper type="flatten"/>
</unzip>
- <mkdir dir="${install.examples}/jts"/>
- <copy todir="${install.examples}/jts" filtering="no">
- <fileset refid="jboss.jbossts:jbossjts:jar"/>
- <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
- <fileset refid="jboss.jbossts:jbossjts-jacorb:jar"/>
+ <mkdir dir="${install.examples}/transactions"/>
+ <copy todir="${install.examples}/transactions" filtering="no">
<fileset refid="jboss.jbossts:jbossts-tools:sar"/>
<mapper refid="remove-versions" />
</copy>
- <unzip src="${jboss.jbossts:resources:jar}" dest="${install.examples}/jts">
- <patternset>
- <include name="resources/jbossjts-properties.xml"/>
- </patternset>
- <mapper type="flatten"/>
- </unzip>
- <!-- copy JBossTS JTS install script and instructions from jbossas-jts module -->
- <copy todir="${install.examples}/jts" filtering="no">
- <fileset dir="${project.root}/jbossas-jts">
+ <copy todir="${install.examples}/transactions" filtering="no" file="${project.thirdparty}/jboss/jbossts/lib/jbossxts.sar"/>
+ <copy tofile="${install.examples}/transactions/jbossts-properties.xml" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossts-properties.xml-forJTS"/>
+
+ <!-- copy JBossTS additions install script and instructions from jbossas-transactions module -->
+ <copy todir="${install.examples}/transactions" filtering="no">
+ <fileset dir="${project.root}/jbossas-transactions">
<include name="README.txt"/>
<include name="build.xml"/>
</fileset>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-06-16 09:43:19 UTC (rev 90245)
+++ trunk/component-matrix/pom.xml 2009-06-16 10:43:20 UTC (rev 90246)
@@ -34,7 +34,7 @@
<version.jacorb>2.3.0jboss.patch6-brew</version.jacorb>
<version.javax.faces>1.2_12</version.javax.faces>
<version.jboss.jaxr>1.2.1.GA</version.jboss.jaxr>
- <version.jboss.jbossts>4.4.0.GA</version.jboss.jbossts>
+ <version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>
<version.jboss.jbossws-common>1.2.0.Beta1</version.jboss.jbossws-common>
<version.jboss.jbossws-framework>3.2.0.Beta1</version.jboss.jbossws-framework>
<version.jboss.jbossws-spi>1.2.0.Beta1</version.jboss.jbossws-spi>
@@ -761,54 +761,55 @@
<version>${version.org.jboss.mx}</version>
</dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- <version>${version.jboss.jbossts}</version>
- </dependency>
-
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta-integration</artifactId>
- <version>${version.jboss.jbossts}</version>
- </dependency>
-
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-common</artifactId>
- <version>${version.jboss.jbossts}</version>
- </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>${version.jboss.jbossts}</version>
+ </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
- <version>${version.jboss.jbossts}</version>
- </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts</artifactId>
+ <version>${version.jboss.jbossts}</version>
+ </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts-integration</artifactId>
- <version>${version.jboss.jbossts}</version>
- </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts-integration</artifactId>
+ <version>${version.jboss.jbossts}</version>
+ </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts-jacorb</artifactId>
- <version>${version.jboss.jbossts}</version>
- </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>${version.jboss.jbossts}</version>
+ </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-tools</artifactId>
- <version>${version.jboss.jbossts}</version>
- <type>jboss-sar</type>
- </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts-jacorb</artifactId>
+ <version>${version.jboss.jbossts}</version>
+ </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>resources</artifactId>
- <version>${version.jboss.jbossts}</version>
- </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-tools</artifactId>
+ <version>${version.jboss.jbossts}</version>
+ <type>jboss-sar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>resources</artifactId>
+ <version>${version.jboss.jbossts}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <version>${version.jboss.jbossts}</version>
+ <type>jboss-sar</type>
+ </dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
Copied: trunk/jbossas-transactions (from rev 90130, trunk/jbossas-jts)
Modified: trunk/jbossas-transactions/README.txt
===================================================================
--- trunk/jbossas-jts/README.txt 2009-06-12 08:45:25 UTC (rev 90130)
+++ trunk/jbossas-transactions/README.txt 2009-06-16 10:43:20 UTC (rev 90246)
@@ -1,37 +1,21 @@
+JTS
+---
+
To remove the default JTA implementation of the transaction service and replace it with the JTS for
-full distributed transaction support, follow the steps below.
+full distributed transaction support, run 'ant jts' or follow the steps below.
-- Do not attempt to use a server with both the JTA and JTS .jar files or both the JTA and JTS config files present.
+- By default the transaction libraries are installed in JBOSS_HOME/common/lib and used by every server configuration.
+ Each server configuration has its own transaction config file, JBOSS_HOME/server/<config>/conf/jbossts-properties.xml
-- By default the JTA libraries are installed in JBOSS_HOME/common/lib and used by every server configuration.
- Each server configuration has its own JTA config file, JBOSS_HOME/server/<config>/conf/jbossjta-properties.xml
-
-- To replace the JTA with JTS for every server <config> dir (not recommended):
- delete JBOSS_HOME/common/lib/jbossjta.jar
- delete JBOSS_HOME/common/lib/jbossjta-integration.jar
- copy jbossjts.jar, jbossjts-integration.jar and jbossjts-jacorb.jar to JBOSS_HOME/common/lib
- delete the JBOSS_HOME/server/<config>/conf/jbossjta-properties files
- copy jbossjts-properties.xml to each of the JBOSS_HOME/server/<config>/conf directories
- Add jacorb to any server config that does not already contain it
- Follow the file editing steps below for each server config
-
- To replace the JTA with JTS for a single server <config> dir:
- copy JBOSS_HOME/common/lib/jbossjta.jar and JBOSS_HOME/common/lib/jbossjta-integration.jar to
- JBOSS_HOME/server/<config>/lib/ for each server you wish to continue using it with
- delete JBOSS_HOME/common/lib/jbossjta.jar
- delete JBOSS_HOME/common/lib/jbossjta-integration.jar
- copy jbossjts.jar, jbossjts-integration.jar and jbossjts-jacorb.jar to
- JBOSS_HOME/server/<config>/lib for each server you wish to use it with i.e. the one that don't have the JTA.
- For each server using the JTS, delete JBOSS_HOME/server/<config>/conf/jbossjta-properties.xml
- and copy jbossjts-properties.xml to JBOSS_HOME/server/<config>/conf/ instead.
- Follow the file editing steps below for each server config using the JTS.
+ For each server using the JTS, delete JBOSS_HOME/server/<config>/conf/jbossts-properties.xml
+ and copy jbossts-properties.xml from this dir to JBOSS_HOME/server/<config>/conf/ instead.
-
- complete the installation by making the following edits to the server configuration
(These are difficult to automate with ant and hence are manual steps for now)
- - edit the conf/jbossjts-properties.xml file and remove the
+ - edit the conf/jbossts-properties.xml file and remove the
recovery extension property containing the value
"com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"
@@ -68,7 +52,7 @@
For each deployment of JacORB, you will need to ensure that the jacorb.implname in the jacorb.properties
file is unique.
-If running an external recovery manager, edit conf/jbossjts-properties.xml to remove
+If running an external recovery manager, edit conf/jbossts-properties.xml to remove
the recovery activator property named "com.arjuna.ats.arjuna.recovery.recoveryActivator_1".
This may be necessary in cluster setups where the ObjectStore is shared, as
there should be only one recovery manager per ObjectStore.
@@ -79,3 +63,24 @@
There is a short article on the JBoss wiki that describes some typical JTS
usage scenarios. It is available at the url https://www.jboss.org/community/docs/DOC-13179
+
+
+XTS (Web Services Transactions)
+-------------------------------
+
+Install XTS to the desired server by running 'ant xts' or following the steps below.
+
+- Unzip the jbossxts.sar file into a directory server/<config>/deploy/jbossxts.sar/
+
+Embedded Tools
+--------------
+
+WARNING: The tools are a prototype and unsupported component, aimed at providing diagnostic information
+regarding the status of transactions, particularly for crash recovery. The tools currently use swing, so are
+suitable only for use from the local host and not in remote or headless situations.
+
+Install the tools using 'ant tools' or by following the steps below.
+
+- Copy the jbossts-tools.jar file to server/<config>/deploy/
+
+The tools swing GUI can then be started from the server's JMX console.
Modified: trunk/jbossas-transactions/build.xml
===================================================================
--- trunk/jbossas-jts/build.xml 2009-06-12 08:45:25 UTC (rev 90130)
+++ trunk/jbossas-transactions/build.xml 2009-06-16 10:43:20 UTC (rev 90246)
@@ -15,79 +15,78 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
- (C) 2008,
+ (C) 2008, 2009
@author JBoss, a division of Red Hat.
-->
<!--
- Ant build script to mostly automate the installation of JBossTS JTS into JBossAS.
+ Ant build script to mostly automate the installation of JBossTS components into JBossAS.
@author Jonathan Halliday (jonathan.halliday at redhat.com), September 2008.
@author Ivo Studensky (istudens at redhat.com)
-->
-<project name="jts-install" default="install" basedir=".">
+<project name="jbossts-install" default="usage" basedir=".">
- <property name="common.lib.dir" value="../../../common/lib"/>
+ <!-- Select which server the JBossTS component will install into.
+ For JTS, must have an ORB configured.
+ For XTS, must have JBossWSNative configured.
+ Path relative to our location (docs/examples/transactions) -->
+ <property name="target.server.dir" value="../../../server/all"/>
- <!-- Select which server the JTS will install into. Must have an ORB configured.
- Path relative to our location (docs/examples/jts) -->
- <property name="jts.server.dir" value="../../../server/all"/>
+ <target name="usage">
+ <echo message="Usage: 'ant jts' : installs JBossTS JTS (distributed JTA) component"/>
+ <echo message=" 'ant xts' : installs JBossTS XTS (Web Services Transactions) component"/>
+ <echo message=" 'ant tools' : installs the embedded transactions tools."/>
+ <echo message=" WARNING: tools are prototype and unsupported"/>
+ </target>
- <!-- Select servers which will continue to use the default JTA -->
- <property name="jta.server.dir.1" value="../../../server/default"/>
- <property name="jta.server.dir.2" value="../../../server/web"/>
+ <!-- install XTS into the designated server. We expand the .sar to make it easier to
+ reference individual .jar files in a user's classpath or edit the config files. -->
+ <target name="xts">
+ <mkdir dir="${target.server.dir}/deploy/jbossxts.sar"/>
+ <unzip src="jbossxts.sar" dest="${target.server.dir}/deploy/jbossxts.sar/"/>
+ </target>
+ <!-- deploy the embedded tools into the designated server -->
+ <target name="tools">
+ <copy file="jbossts-tools.sar" todir="${target.server.dir}/deploy/"/>
+ </target>
- <target name="install">
+ <!-- install the JTS into the designated server -->
+ <target name="jts">
- <!-- install the JTA to the servers that still need it -->
- <copy todir="${jta.server.dir.1}/lib/">
- <fileset dir="${common.lib.dir}" includes="jbossjta*.jar"/>
- </copy>
- <copy todir="${jta.server.dir.2}/lib/">
- <fileset dir="${common.lib.dir}" includes="jbossjta*.jar"/>
- </copy>
-
- <!-- back out the common JTA, it does not cohabit well with the JTS -->
- <delete file="${common.lib.dir}/jbossjta.jar"/>
- <delete file="${common.lib.dir}/jbossjta-integration.jar"/>
-
- <!-- rename the JTA properties file rather than deleting it,
+ <!-- rename the JTA version of the properties file rather than deleting it,
as it may have customizations we don't want to lose. -->
- <move file="${jts.server.dir}/conf/jbossjta-properties.xml" tofile="${jts.server.dir}/conf/jbossjta-properties-old.xml"/>
+ <move file="${target.server.dir}/conf/jbossts-properties.xml"
+ tofile="${target.server.dir}/conf/jbossts-properties-old-for-jta.xml"/>
- <!-- drop in the JTS components -->
- <copy file="jbossjts.jar" todir="${jts.server.dir}/lib/"/>
- <copy file="jbossjts-integration.jar" todir="${jts.server.dir}/lib/"/>
- <copy file="jbossjts-jacorb.jar" todir="${jts.server.dir}/lib/"/>
- <copy file="jbossjts-properties.xml" todir="${jts.server.dir}/conf/"/>
+ <copy file="jbossts-properties.xml" todir="${target.server.dir}/conf/"/>
- <echo message="Transaction service libraries and configuration installed."/>
+ <echo message="Transaction service configuration file installed."/>
<!-- rewrite the config files for the server that is using JTS -->
- <antcall target="modify-config-files">
- <param name="server.dir" value="${jts.server.dir}"/>
+ <antcall target="modify-jts-config-files">
+ <param name="server.dir" value="${target.server.dir}"/>
</antcall>
- <echo message="JTS config files updated for ${jts.server.dir}"/>
+ <echo message="JBossAS config files updated to run JTS in config ${target.server.dir}"/>
</target>
+ <target name="modify-jts-config-files">
-
- <target name="modify-config-files">
<!--
- edit the conf/jbossjts-properties.xml file and remove the
+ edit the conf/jbossts-properties.xml file and remove the
recovery extension property containing the value
"com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"
-->
<replaceregexp
- file="${server.dir}/conf/jbossjts-properties.xml"
+ file="${server.dir}/conf/jbossts-properties.xml"
match="<property\s+name=.com\.arjuna\.ats\.arjuna\.recovery\.recoveryExtension\d+.\s*value=.com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule.\s*/>"
replace="" />
<!--
- In deploy/transaction-beans.xml, update the TransactionManager class and dependencies as follows:
+ In deploy/transaction-jboss-beans.xml, update the TransactionManager class and dependencies as follows:
<bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jts.TransactionManagerService">
...
<start>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2009-06-16 09:43:19 UTC (rev 90245)
+++ trunk/thirdparty/pom.xml 2009-06-16 10:43:20 UTC (rev 90246)
@@ -1324,14 +1324,6 @@
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta-integration</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
<artifactId>jbossts-common</artifactId>
</dependency>
<dependency>
@@ -1356,6 +1348,11 @@
<artifactId>resources</artifactId>
</dependency>
<dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossxts</artifactId>
+ <type>jboss-sar</type>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-saaj</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list