[jboss-svn-commits] JBL Code SVN: r31740 - in labs/jbosstm/trunk: XTS/WS-C and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 19 06:27:14 EST 2010
Author: jhalliday
Date: 2010-02-19 06:27:13 -0500 (Fri, 19 Feb 2010)
New Revision: 31740
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WSAS/build.xml
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/build.xml
labs/jbosstm/trunk/XTS/demo/xts-build.xml
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
labs/jbosstm/trunk/XTS/recovery/build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
labs/jbosstm/trunk/XTS/sar/tests/build.xml
labs/jbosstm/trunk/maven/pom-template.xml
labs/jbosstm/trunk/txbridge/demo/build.xml
Log:
update build for AS 6.0 M2 JBTM-708
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -70,11 +70,11 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
-
+
<!-- paths internal to build -->
<path id="build.classpath">
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -71,9 +71,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -59,9 +59,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -58,9 +58,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -58,9 +58,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -56,9 +56,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/demo/xts-build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/xts-build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/demo/xts-build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -81,9 +81,10 @@
geronimo-ws-metadata_2.0_spec.jar">
<isset property="cxf.build"/>
</condition>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar ${cxf.client.lib.jars}"/>
+
+ <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-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"/>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -75,9 +75,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -75,9 +75,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/recovery/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/recovery/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -58,9 +58,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -84,9 +84,9 @@
</condition>
<!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
- jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ <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}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/XTS/sar/tests/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/XTS/sar/tests/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -57,8 +57,8 @@
<property name="xts.lib.jars" value="jbossxts-api.jar"/>
<property name="jboss.client.lib.dir" value="${jbossas.home}/client"/>
- <property name="jboss.client.lib.jars" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
- jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar jboss-jaxws.jar jboss-logging-spi.jar"/>
+ <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"/>
Modified: labs/jbosstm/trunk/maven/pom-template.xml
===================================================================
--- labs/jbosstm/trunk/maven/pom-template.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/maven/pom-template.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -165,9 +165,10 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <!-- http://repository.jboss.com/maven2/org/jboss/jbossas/jboss-as-component-matrix -->
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-component-matrix</artifactId>
- <version>6.0.0.M1</version>
+ <version>6.0.0.20100216-M2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -267,11 +268,13 @@
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jcommon</artifactId>
+ <version>1.0.2</version>
</dependency>
<!-- atsintegration (i.e. the JBossAS glue code) requires some app server bits. -->
@@ -341,26 +344,6 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxws</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxws-ext</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-core</artifactId>
</dependency>
@@ -381,8 +364,11 @@
<!-- txbridge demo -->
<dependency>
- <groupId>org.hibernate.java-persistence</groupId>
- <artifactId>jpa-api</artifactId>
+ <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/txbridge/demo/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/demo/build.xml 2010-02-19 05:09:41 UTC (rev 31739)
+++ labs/jbosstm/trunk/txbridge/demo/build.xml 2010-02-19 11:27:13 UTC (rev 31740)
@@ -38,7 +38,7 @@
<include name="servlet-api.jar"/>
<include name="log4j.jar"/>
<include name="jta.jar"/>
- <include name="jpa-api.jar"/>
+ <include name="hibernate-jpa-2.0-api.jar"/>
<include name="jboss-ejb-api.jar"/>
</fileset>
More information about the jboss-svn-commits
mailing list