[jboss-cvs] JBossAS SVN: r78961 - in trunk: component-matrix and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 30 11:24:03 EDT 2008
Author: jhalliday
Date: 2008-09-30 11:24:03 -0400 (Tue, 30 Sep 2008)
New Revision: 78961
Added:
trunk/jbossas/jts/
trunk/jbossas/jts/README.txt
trunk/jbossas/jts/build.xml
Modified:
trunk/build/build-distr.xml
trunk/component-matrix/pom.xml
trunk/thirdparty/pom.xml
Log:
Upgraded JBossTS to 4.4.0.GA, adding JTS elements in the process. JBAS-5919
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-09-30 15:23:17 UTC (rev 78960)
+++ trunk/build/build-distr.xml 2008-09-30 15:24:03 UTC (rev 78961)
@@ -2032,15 +2032,33 @@
</patternset>
</unzip>
- <!-- copy binary release of JBossTS from thirdparty repo -->
+ <!-- copy binary release of JBossTS (JTA part) 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>
+ <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 binary release of JBossTS (JTS part) from thirdparty repo -->
+ <mkdir dir="${install.examples}/jts"/>
+ <copy todir="${install.examples}/jts" filtering="no">
+ <fileset dir="${project.thirdparty}/jboss/jbossts/lib/">
+ <include name="jbossjts.jar"/>
+ <include name="jbossjts-integration.jar"/>
+ <include name="jbossjts-jacorb.jar"/>
+ <include name="jbossts-tools.sar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.examples}/jts" filtering="no" file="${project.thirdparty}/jboss/jbossts/resources/jbossjts-properties.xml"/>
+ <!-- copy JBossTS JTS install script and instructions from jbossas/jts module -->
+ <copy todir="${install.examples}/jts" filtering="no">
+ <fileset dir="${project.root}/jbossas/jts">
+ <include name="README.txt"/>
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
<chmod perm="+x">
<fileset dir="${install.bin}">
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-09-30 15:23:17 UTC (rev 78960)
+++ trunk/component-matrix/pom.xml 2008-09-30 15:24:03 UTC (rev 78961)
@@ -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.4.0.CR2</version.jboss.jbossts>
+ <version.jboss.jbossts>4.4.0.GA</version.jboss.jbossts>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jaxr>1.2.0.SP2</version.jboss.jaxr>
<version.jboss.jbossws>3.0.3.GA</version.jboss.jbossws>
@@ -683,9 +683,34 @@
<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-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-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>
Added: trunk/jbossas/jts/README.txt
===================================================================
--- trunk/jbossas/jts/README.txt (rev 0)
+++ trunk/jbossas/jts/README.txt 2008-09-30 15:24:03 UTC (rev 78961)
@@ -0,0 +1,54 @@
+
+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.
+
+ - edit build.xml to set the server directory you wish to upgrade.
+ You must select a server that has an ORB configured. By default 'all' is used.
+ You may want to make a backup first.
+
+ - run 'ant' to remove the JTA implementation and replace it with the JTS implementation.
+
+ - 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
+ recovery extension property containing the value
+ "com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"
+
+ - In deploy/transaction-beans.xml, update the TransactionManager class and dependencies as follows:
+
+ <bean name="TransactionManager" class="com.arjuna.ats.jbossatx.jts.TransactionManagerService">
+ ...
+ <start>
+ <parameter><inject bean="jboss:service=CorbaORB" property="ORB"/></parameter>
+ </start>
+ ...
+ </bean>
+
+ - Edit the conf/jacorb.properies as follows.
+ - change the jacorb.poa.thread_pool_max property to 32
+
+ - Edit the deploy/iiop-service.xml and modify the
+ PortableInterceptorInitializers attribute as follows.
+ - remove the following lines
+ <!-- comment out to disable null transaction propagation over IIOP -->
+ <initializer>org.jboss.tm.iiop.TxServerClientInterceptorInitializer</initializer>
+ <!-- comment out to disable transaction demarcation over IIOP -->
+ <initializer>org.jboss.tm.iiop.TxServerInterceptorInitializer</initializer>
+ - add the following lines
+ <!-- JBoss TS interceptor. -->
+ <initializer>com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition.InterpositionORBInitializerImpl</initializer>
+ <!-- RMI/IIOP tx context interceptor -->
+ <initializer>com.arjuna.ats.jbossatx.jts.InboundTransactionCurrentInitializer</initializer>
+
+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
+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.
+
+Finally, note that the application server binds to the
+localhost address by default. This is generally inappropriate for distributed transactions,
+so please ensure the server is bound to a alternative address.
Added: trunk/jbossas/jts/build.xml
===================================================================
--- trunk/jbossas/jts/build.xml (rev 0)
+++ trunk/jbossas/jts/build.xml 2008-09-30 15:24:03 UTC (rev 78961)
@@ -0,0 +1,53 @@
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ 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,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2008,
+ @author JBoss, a division of Red Hat.
+-->
+
+<!--
+ Ant build script to partially automate the installation of JBossTS JTS into JBossAS.
+ @author Jonathan Halliday (jonathan.halliday at redhat.com), September 2008.
+-->
+<project name="jts-install" default="install" basedir=".">
+
+ <!-- Select which server the JTS will install into. Must have an ORB configured.
+ Path relative to our location (docs/examples/jts) -->
+ <property name="server.dir" value="../../../server/all"/>
+
+
+ <target name="install">
+
+ <!-- back out the JTA, it does not cohabit well with the JTS -->
+ <delete file="${server.dir}/lib/jbossjta.jar"/>
+ <delete file="${server.dir}/lib/jbossjta-integration.jar"/>
+ <!-- rename the JTA properties file rather than deleting it,
+ as it may have customizations we don't want to lose. -->
+ <move file="${server.dir}/conf/jbossjta-properties.xml" tofile="${server.dir}/conf/jbossjta-properties-old.xml"/>
+
+ <!-- drop in the JTS components -->
+ <copy file="jbossjts.jar" todir="${server.dir}/lib/"/>
+ <copy file="jbossjts-integration.jar" todir="${server.dir}/lib/"/>
+ <copy file="jbossjts-jacorb.jar" todir="${server.dir}/lib/"/>
+ <copy file="jbossjts-properties.xml" todir="${server.dir}/conf/"/>
+
+ <echo message="Transaction service libraries and configuration updated."/>
+ <echo message="Now perform remaining manual install steps per the README.txt file."/>
+
+ </target>
+
+</project>
\ No newline at end of file
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-09-30 15:23:17 UTC (rev 78960)
+++ trunk/thirdparty/pom.xml 2008-09-30 15:24:03 UTC (rev 78961)
@@ -1265,6 +1265,23 @@
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts-integration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts-jacorb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-tools</artifactId>
+ <type>jboss-sar</type>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
<artifactId>resources</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list