jbossas-transactions/README.txt jbossas-transactions/build.xml @@ -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 @@ ${client.jar.files} <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,7 +2213,15 @@ ${client.jar.files} </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> @@ -2219,24 +2230,18 @@ ${client.jar.files} <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> build/build.xml @@ -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> component-matrix/pom.xml @@ -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> thirdparty/pom.xml jbossas-jts/README.txt jbossas-jts/build.xml 393a87f755e85b3e1c77468c747512225352cc8d jhalliday jhalliday@84be2c1e-ba19-0410-b317-a758671a6fc1 http://github.com/bobmcwhirter/jbossas/commit/f30d603d6eaab9b2193771dbc4f4953df7e8cbad f30d603d6eaab9b2193771dbc4f4953df7e8cbad 2009-06-16T03:43:20-07:00 2009-06-16T03:43:20-07:00 Upgrade JBossTS to 4.6.1.GA. JBAS-7022 git-svn-id: http://anonsvn.jboss.org/repos/jbossas/trunk@90246 84be2c1e-ba19-0410-b317-a758671a6fc1 cc4d5d0f7ccb0e01a940623a1ee1484efb2b9698 jhalliday jhalliday@84be2c1e-ba19-0410-b317-a758671a6fc1