[jboss-svn-commits] JBL Code SVN: r32125 - in labs/jbosstm/trunk: ArjunaJTA/jdbc and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 17 06:14:02 EDT 2010
Author: jhalliday
Date: 2010-03-17 06:14:00 -0400 (Wed, 17 Mar 2010)
New Revision: 32125
Modified:
labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
labs/jbosstm/trunk/ArjunaJTA/tsmx/build.xml
labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
labs/jbosstm/trunk/XTS/demo/xts-build.xml
labs/jbosstm/trunk/XTS/sar/tests/build.xml
labs/jbosstm/trunk/XTS/sharedbuild.xml
labs/jbosstm/trunk/atsintegration/build.xml
labs/jbosstm/trunk/maven/pom-template.xml
labs/jbosstm/trunk/qa/tests/build-jta.xml
labs/jbosstm/trunk/qa/tests/build-jts.xml
labs/jbosstm/trunk/txbridge/build.xml
labs/jbosstm/trunk/txbridge/demo/build.xml
Log:
Update build dependencies to match latest version of AS trunk.
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -47,7 +47,7 @@
<compile.macro>
<additional.classpath>
- <fileset dir="${global.ext.lib.dir}" includes="jta.jar"/>
+ <fileset dir="${global.ext.lib.dir}" includes="jboss-transaction-api_1.1_spec.jar"/>
</additional.classpath>
<additional.src.dirs>
<src location="bin"/>
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -24,7 +24,7 @@
<property name="excluded.classes" value="**/*JDBC3.java"/>
- <property name="global.ext.libs" value="jta.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar"/>
<import file="../../sharedbuild.xml"/>
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -22,7 +22,7 @@
<property name="modulename" value="jta"/>
- <property name="global.ext.libs" value="jta.jar,jboss-jca-api.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,jboss-connector-api_1.5_spec.jar"/>
<import file="../../sharedbuild.xml"/>
Modified: labs/jbosstm/trunk/ArjunaJTA/tsmx/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/tsmx/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/ArjunaJTA/tsmx/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -43,7 +43,7 @@
<mkdir dir="${basedir}/${src.dir}"/>
<compile.macro>
<additional.classpath>
- <fileset dir="${global.ext.lib.dir}" includes="jta.jar"/>
+ <fileset dir="${global.ext.lib.dir}" includes="jboss-transaction-api_1.1_spec.jar"/>
<fileset dir="${install.dir}" includes="${modulename}-tools.jar"/>
<fileset dir="${install.dir}" includes="${modulename}-objectstorebrowser.jar"/>
</additional.classpath>
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -22,7 +22,7 @@
<property name="modulename" value="jtax"/>
- <property name="global.ext.libs" value="jta.jar,jboss-jca-api.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,jboss-connector-api_1.5_spec.jar"/>
<import file="../sharedbuild.xml"/>
Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -87,7 +87,7 @@
jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
<property name="jboss.client.libs" value="${jboss.client.lib.jars}"/>
- <property name="jboss.common.libs" value="servlet-api.jar"/>
+ <property name="jboss.common.libs" value="jboss-servlet-api_3.0_spec.jar"/>
<!-- ================================================================== -->
Modified: labs/jbosstm/trunk/XTS/sar/tests/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/XTS/sar/tests/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -60,7 +60,7 @@
<property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-client.jar stax-api.jar
jbossws-native-core.jar jbossws-common.jar jboss-jaxws.jar jboss-logging-spi.jar"/>
<property name="jboss.common.lib.dir" location="${jbossas.home}/common/lib"/>
- <property name="jboss.common.lib.jars" value="servlet-api.jar"/>
+ <property name="jboss.common.lib.jars" value="jboss-servlet-api_3.0_spec.jar"/>
<target name="init">
<delete dir="${build.dir}"/>
Modified: labs/jbosstm/trunk/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -72,7 +72,7 @@
<property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
jbossws-client.jar stax-api.jar
jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+ jboss-transaction-api_1.1_spec.jar jboss-servlet-api_3.0_spec.jar dom4j.jar ${cxf.build.extlib.jars}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/atsintegration/build.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/atsintegration/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -22,7 +22,7 @@
<property name="modulename" value="jbossatx"/>
- <property name="global.ext.libs" value="jta.jar,jboss-jca-api.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,jboss-connector-api_1.5_spec.jar"/>
<property name="component-module-list" value="../atsintegration"/>
Modified: labs/jbosstm/trunk/maven/pom-template.xml
===================================================================
--- labs/jbosstm/trunk/maven/pom-template.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/maven/pom-template.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -165,10 +165,12 @@
<dependencyManagement>
<dependencies>
<dependency>
- <!-- http://repository.jboss.com/maven2/org/jboss/jbossas/jboss-as-component-matrix -->
+ <!-- http://repository.jboss.com/maven2/org/jboss/jbossas/jboss-as-component-matrix/
+ http://snapshots.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-matrix/ -->
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-component-matrix</artifactId>
- <version>6.0.0.20100216-M2</version>
+ <!--<version>6.0.0.20100216-M2</version>-->
+ <version>6.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -206,16 +208,13 @@
<!-- JTA (local: ArjunaJTA/jta and remote: ArjunaJTS/jtax) need JTA and JCA (for tx inflow) apis. -->
<dependency>
- <!-- switch to http://repository.jboss.com/maven2/org/jboss/javaee/jboss-transaction-api/
- when it becomes available. -->
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
</dependency>
<!-- unit tests use junit4 and some use byteman -->
@@ -306,8 +305,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
@@ -318,8 +317,8 @@
<!-- XTS: -->
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<dependency>
@@ -366,9 +365,6 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
-
- <!--<groupId>org.hibernate.java-persistence</groupId>-->
- <!--<artifactId>jpa-api</artifactId>-->
</dependency>
</dependencies>
Modified: labs/jbosstm/trunk/qa/tests/build-jta.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jta.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/qa/tests/build-jta.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -39,7 +39,7 @@
<include name="jbossjta.jar"/>
</fileset>
<fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/ext">
- <include name="jta.jar"/>
+ <include name="jboss-transaction-api_1.1_spec.jar"/>
</fileset>
<fileset dir="../../build/extlib" includes="junit.jar"/>
<pathelement location="../ext/jboss-profiler-jvmti.jar"/>
@@ -99,7 +99,7 @@
<!-- additional dependency, which is why we don't just do this in compile task above: -->
<!-- include classes for AS tests -->
<fileset dir="../../build/extlib">
- <include name="jta.jar"/>
+ <include name="jboss-transaction-api_1.1_spec.jar"/>
<include name="jboss-ejb-api.jar"/>
<include name="jboss-server-manager.jar"/>
<include name="jboss-transaction-spi.jar"/>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -49,7 +49,7 @@
<include name="jbossjts-${org.jboss.jbossts.qa.orb.name.short}.jar"/>
</fileset>
<fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/ext">
- <include name="jta.jar"/>
+ <include name="jboss-transaction-api_1.1_spec.jar"/>
</fileset>
<pathelement location="../../ArjunaJTS/orbportability/config"/>
<!--<fileset file="${org.jboss.jbossts.qa.server_manager_location}" />-->
@@ -223,8 +223,8 @@
<!-- include classes for AS tests -->
<fileset dir="../../build/extlib">
<include name="jboss-server-manager.jar"/>
- <include name="jta.jar"/>
- <include name="jboss-ejb-api.jar"/>
+ <include name="jboss-transaction-api_1.1_spec.jar"/>
+ <include name="jboss-ejb-api_3.1_spec.jar"/>
<include name="jboss-transaction-spi.jar"/>
<include name="jboss-remoting.jar"/>
</fileset>
Modified: labs/jbosstm/trunk/txbridge/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/txbridge/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -39,8 +39,8 @@
<fileset dir="../build/extlib">
<include name="log4j.jar"/>
- <include name="jta.jar"/>
- <include name="jboss-jca-api.jar"/>
+ <include name="jboss-transaction-api_1.1_spec.jar"/>
+ <include name="jboss-connector-api_1.5_spec.jar"/>
</fileset>
<fileset dir="${jbossts.home}/XTS/xts-install/lib">
Modified: labs/jbosstm/trunk/txbridge/demo/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/demo/build.xml 2010-03-17 07:46:09 UTC (rev 32124)
+++ labs/jbosstm/trunk/txbridge/demo/build.xml 2010-03-17 10:14:00 UTC (rev 32125)
@@ -35,11 +35,11 @@
<path id="build-prereqs">
<fileset dir="../../build/extlib">
- <include name="servlet-api.jar"/>
+ <include name="jboss-servlet-api_3.0_spec.jar"/>
<include name="log4j.jar"/>
- <include name="jta.jar"/>
+ <include name="jboss-transaction-api_1.1_spec.jar"/>
<include name="hibernate-jpa-2.0-api.jar"/>
- <include name="jboss-ejb-api.jar"/>
+ <include name="jboss-ejb-api_3.1_spec.jar"/>
</fileset>
<fileset dir="${jbossts.home}/XTS/xts-install/lib">
More information about the jboss-svn-commits
mailing list