[jbossws-commits] JBossWS SVN: r6632 - in stack/cxf/branches/tdiesler/trunk: modules/testsuite and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 09:21:26 -0400 (Wed, 23 Apr 2008) New Revision: 6632 Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml Log: tests all good Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 11:49:47 UTC (rev 6631) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 13:21:26 UTC (rev 6632) @@ -24,6 +24,7 @@ <arg value="package"/> <arg value="assembly:directory"/> </exec> + <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> </target> <!-- ================================================================== --> Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-23 11:49:47 UTC (rev 6631) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-23 13:21:26 UTC (rev 6632) @@ -55,7 +55,7 @@ super.setUp(); SpringBusFactory busFactory = new SpringBusFactory(); - URL cxfConfig = new File("resources/jaxws/samples/wsrm/wsrm-client-config.xml").toURL(); + URL cxfConfig = getResourceURL("jaxws/samples/wsrm/wsrm-client-config.xml"); bus = busFactory.createBus(cxfConfig); busFactory.setDefaultBus(bus); Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 11:49:47 UTC (rev 6631) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 13:21:26 UTC (rev 6632) @@ -107,7 +107,6 @@ <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> @@ -171,6 +170,16 @@ <artifactId>jbossws-jboss42</artifactId> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> + </configuration> + </plugin> + </plugins> + </build> </profile> <!-- Modified: stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 11:49:47 UTC (rev 6631) +++ stack/cxf/branches/tdiesler/trunk/scripts/assembly-install-jboss422.xml 2008-04-23 13:21:26 UTC (rev 6632) @@ -137,6 +137,8 @@ <include>*:cxf-*</include> <include>*:geronimo-javamail*</include> <include>*:geronimo-ws-metadata*</include> + <include>*:jaxb-api:jar</include> + <include>*:jaxb-impl:jar</include> <include>*:jaxrpc-api*</include> <include>*:jaxws-api*</include> <include>*:neethi*</include> @@ -145,11 +147,19 @@ <include>*:spring-beans*</include> <include>*:spring-context*</include> <include>*:spring-core*</include> + <include>*:stax-api*</include> <include>*:wsdl4j*</include> <include>*:xml-resolver*</include> <include>*:XmlSchema*</include> </includes> </dependencySet> + <dependencySet> + <outputFileNameMapping>wstx.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:wstx-asl:jar</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet>