Author: thomas.diesler(a)jboss.com Date: 2008-04-22 03:32:10 -0400 (Tue, 22 Apr 2008) New Revision: 6604 Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml Log: All tests ok Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-22 04:51:23 UTC (rev 6603) +++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-22 07:32:10 UTC (rev 6604) @@ -93,6 +93,18 @@ <!-- transitve dependencies --> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> <groupId>jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <type>sar</type> Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-22 04:51:23 UTC (rev 6603) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-22 07:32:10 UTC (rev 6604) @@ -107,6 +107,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args}</argLine> + <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> <!--argLine>${surefire.jdpw.args}</argLine--> <systemProperties> <property> @@ -118,6 +119,10 @@ <value>org.jboss.wsf.common.logging.JDKLogManager</value> </property> <property> + <name>jboss.home</name> + <value>${jboss422.home}</value> + </property> + <property> <name>jbossws.integration.target</name> <value>${jbossws.integration.target}</value> </property> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 04:51:23 UTC (rev 6603) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-22 07:32:10 UTC (rev 6604) @@ -26,6 +26,8 @@ <jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <juddi.service.version>1.2.0.GA</juddi.service.version> + <jaxb.api.version>2.1</jaxb.api.version> + <jaxb.impl.version>2.1.6</jaxb.impl.version> </properties> <!-- Modules --> @@ -33,6 +35,7 @@ <module>modules/management</module> <module>modules/server</module> <module>modules/client</module> + <module>modules/testsuite</module> </modules> <!-- DependencyManagement --> @@ -95,12 +98,6 @@ <version>1.0-MR1</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> <!-- CXF dependencies --> <dependency> @@ -144,6 +141,12 @@ <version>${cxf.version}</version> </dependency> <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>stax</groupId> <artifactId>stax-api</artifactId> <version>${cxf.stax.version}</version> @@ -159,6 +162,21 @@ <!-- transitve dependencies --> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.api.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.impl.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>${jaxb.impl.version}</version> + </dependency> + <dependency> <groupId>jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> <version>${juddi.service.version}</version>