[riftsaw-commits] riftsaw SVN: r972 - in trunk/integration-tests: src/test/resources/samples/Tutorial_bpel_atm/bpel and 1 other directories.

[riftsaw-commits at lists.jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-09-22 00:27:24 -0400 (Wed, 22 Sep 2010)
New Revision: 972

Added:
   trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.endpoint
   trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/trip.endpoint
Modified:
   trunk/integration-tests/pom.xml
Log:
RIFTSAW-126 clean up integration-tests classpath to resolve jaxb implementation conflicts in jaxws-based tests;
decrease mex.timeout for tutorials

Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml	2010-09-22 03:39:17 UTC (rev 971)
+++ trunk/integration-tests/pom.xml	2010-09-22 04:27:24 UTC (rev 972)
@@ -21,12 +21,6 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>woodstox</groupId>
-			<artifactId>wstx-asl</artifactId>
-			<version>3.2.6</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
@@ -61,6 +55,24 @@
 			<version>${jboss.version}</version>
 			<type>pom</type>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>sun-jaxws</groupId>
+					<artifactId>jaxws-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>sun-jaxws</groupId>
+					<artifactId>jsr181-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>sun-jaxb</groupId>
+					<artifactId>jaxb-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>jboss.jbossws</groupId>
+					<artifactId>jboss-jaxws</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jbossas</groupId>
@@ -68,6 +80,16 @@
 			<version>${jboss.version}</version>
 			<classifier>jboss-aop-jboss5</classifier>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>sun-jaxws</groupId>
+					<artifactId>jaxws-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>sun-jaxws</groupId>
+					<artifactId>jsr181-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.jbossas</groupId>
@@ -134,6 +156,12 @@
 			<artifactId>uddi-ws</artifactId>
 			<version>3.0.0</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.sun.xml.ws</groupId>
+					<artifactId>jaxws-rt</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>commons-configuration</groupId>
@@ -174,10 +202,6 @@
         <scope>test</scope>
         <exclusions>
           <exclusion>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-          </exclusion>
-          <exclusion>
             <groupId>javax.xml.soap</groupId>
             <artifactId>saaj-api</artifactId>
           </exclusion>
@@ -202,10 +226,6 @@
         <scope>test</scope>
         <exclusions>
           <exclusion>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-          </exclusion>
-          <exclusion>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
           </exclusion>
@@ -244,10 +264,6 @@
         <scope>test</scope>
         <exclusions>
           <exclusion>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-          </exclusion>
-          <exclusion>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
           </exclusion>
@@ -360,10 +376,6 @@
         <scope>test</scope>
         <exclusions>
           <exclusion>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-          </exclusion>
-          <exclusion>
             <groupId>javax.xml.soap</groupId>
             <artifactId>saaj-api</artifactId>
           </exclusion>

Added: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.endpoint
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.endpoint	                        (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_atm/bpel/atm.endpoint	2010-09-22 04:27:24 UTC (rev 972)
@@ -0,0 +1,2 @@
+# 15 seconds
+mex.timeout=15000

Added: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/trip.endpoint
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/trip.endpoint	                        (rev 0)
+++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_travel_agency/bpel/trip.endpoint	2010-09-22 04:27:24 UTC (rev 972)
@@ -0,0 +1,2 @@
+# 15 seconds
+mex.timeout=15000