Author: thomas.diesler(a)jboss.com Date: 2008-05-01 15:48:31 -0400 (Thu, 01 May 2008) New Revision: 6834 Modified: stack/native/branches/tdiesler/trunk/.classpath stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/pom.xml stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/src/scripts/build-samples-jaxrpc.xml stack/native/branches/tdiesler/trunk/modules/testsuite/pom.xml stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss422.txt stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss423.txt stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss501.txt Log: Modified: stack/native/branches/tdiesler/trunk/.classpath =================================================================== --- stack/native/branches/tdiesler/trunk/.classpath 2008-05-01 12:20:20 UTC (rev 6833) +++ stack/native/branches/tdiesler/trunk/.classpath 2008-05-01 19:48:31 UTC (rev 6834) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/jaxrpc/src/main/java"/> + <classpathentry kind="src" path="modules/testsuite/native-tests/src/test/java"/> + <classpathentry kind="src" path="modules/testsuite/framework-tests/src/test/java"/> <classpathentry kind="src" path="modules/core/src/main/java"/> <classpathentry kind="src" path="modules/jaxws-ext/src/main/java"/> <classpathentry kind="src" path="modules/jaxws/src/main/java"/> Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/pom.xml 2008-05-01 12:20:20 UTC (rev 6833) +++ stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/pom.xml 2008-05-01 19:48:31 UTC (rev 6834) @@ -13,6 +13,16 @@ <version>3.0.2-SNAPSHOT</version> </parent> + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>qdox</groupId> + <artifactId>qdox</artifactId> + <version>1.4</version> + <scope>test</scope> + </dependency> + </dependencies> + <!-- Plugins --> <build> <plugins> @@ -27,6 +37,9 @@ <configuration> <tasks> <property name="tests.output.dir" value="${project.build.directory}"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <ant antfile="src/scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> + <ant antfile="src/scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="src/scripts/build-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="src/scripts/build-samples-jaxws.xml" target="build-samples-jaxws"/> </tasks> Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/src/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/src/scripts/build-samples-jaxrpc.xml 2008-05-01 12:20:20 UTC (rev 6833) +++ stack/native/branches/tdiesler/trunk/modules/testsuite/native-tests/src/scripts/build-samples-jaxrpc.xml 2008-05-01 19:48:31 UTC (rev 6834) @@ -633,7 +633,7 @@ </metainf> </jar> - <!-- jaxrpc-samples-wsbpel --> + <!-- jaxrpc-samples-wsbpel - -> <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/> @@ -661,7 +661,7 @@ <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> <include name="jaxrpc-mapping.xml"/> </metainf> - </jar> + </jar--> <!-- jaxrpc-samples-wssecurity-sign --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-05-01 12:20:20 UTC (rev 6833) +++ stack/native/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-05-01 19:48:31 UTC (rev 6834) @@ -32,6 +32,11 @@ <artifactId>jbossws-native-client</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-embedded</artifactId> + <version>${version}</version> + </dependency> <dependency> <groupId>org.jboss.ws</groupId> Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-01 12:20:20 UTC (rev 6833) +++ stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-01 19:48:31 UTC (rev 6834) @@ -7,16 +7,16 @@ org/jboss/test/ws/jaxws/webserviceref/** # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* +org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase/* -# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail +# [JBWS-1762] web/xml modified to web/xml/org - Subsequent runs fail # This requires changes to the AS web meta data (servlet init params) org/jboss/test/ws/jaxws/jbws1762/** -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml +# [JBWS-1797] Setting /NET friendly Endpoint in web/xml org/jboss/test/ws/jaxws/jbws1797/** -# [JBWS-1813] context-root from jboss.xml +# [JBWS-1813] context-root from jboss/xml org/jboss/test/ws/jaxws/jbws1813/** # [JBWS-1841] WebServiceRef injection from DD doesn't work @@ -31,3 +31,36 @@ # [JBWS-2163] wsconsume for maven build --> org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** +org/jboss/test/ws/jaxws/smoke/tools/** +org/jboss/test/ws/benchmark/** +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/** +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/** +org/jboss/test/ws/jaxws/samples/wssecurity/** + +# [JBWS-2167] Fix samples jaxr for maven build +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-2168] Fix samples bpel for maven build +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# [JBWS-2169] Fix samples jaxrpc for maven build +org/jboss/test/ws/jaxrpc/samples/docstyle/** +org/jboss/test/ws/jaxrpc/samples/dynamichandler/** +org/jboss/test/ws/jaxrpc/samples/exception/** +org/jboss/test/ws/jaxrpc/samples/handler/** +org/jboss/test/ws/jaxrpc/samples/holder/** +org/jboss/test/ws/jaxrpc/samples/jmstransport/** +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** +org/jboss/test/ws/jaxrpc/samples/jsr109pojo/** +org/jboss/test/ws/jaxrpc/samples/message/** +org/jboss/test/ws/jaxrpc/samples/oneway/** +org/jboss/test/ws/jaxrpc/samples/rpcstyle/** +org/jboss/test/ws/jaxrpc/samples/secureejb/** +org/jboss/test/ws/jaxrpc/samples/wsaddr/** +org/jboss/test/ws/jaxrpc/samples/wsbpel/** +org/jboss/test/ws/jaxrpc/samples/wssecurity/** + +# [JBWS-2170] Fix embedded for maven build +org/jboss/test/ws/embedded/** + Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-01 12:20:20 UTC (rev 6833) +++ stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-01 19:48:31 UTC (rev 6834) @@ -15,3 +15,36 @@ # [JBWS-2163] wsconsume for maven build --> org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** +org/jboss/test/ws/jaxws/smoke/tools/** +org/jboss/test/ws/benchmark/** +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/** +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/** +org/jboss/test/ws/jaxws/samples/wssecurity/** + +# [JBWS-2167] Fix samples jaxr for maven build +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-2168] Fix samples bpel for maven build +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# [JBWS-2169] Fix samples jaxrpc for maven build +org/jboss/test/ws/jaxrpc/samples/docstyle/** +org/jboss/test/ws/jaxrpc/samples/dynamichandler/** +org/jboss/test/ws/jaxrpc/samples/exception/** +org/jboss/test/ws/jaxrpc/samples/handler/** +org/jboss/test/ws/jaxrpc/samples/holder/** +org/jboss/test/ws/jaxrpc/samples/jmstransport/** +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** +org/jboss/test/ws/jaxrpc/samples/jsr109pojo/** +org/jboss/test/ws/jaxrpc/samples/message/** +org/jboss/test/ws/jaxrpc/samples/oneway/** +org/jboss/test/ws/jaxrpc/samples/rpcstyle/** +org/jboss/test/ws/jaxrpc/samples/secureejb/** +org/jboss/test/ws/jaxrpc/samples/wsaddr/** +org/jboss/test/ws/jaxrpc/samples/wsbpel/** +org/jboss/test/ws/jaxrpc/samples/wssecurity/** + +# [JBWS-2170] Fix embedded for maven build +org/jboss/test/ws/embedded/** + Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-01 12:20:20 UTC (rev 6833) +++ stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-01 19:48:31 UTC (rev 6834) @@ -24,3 +24,36 @@ # [JBWS-2163] wsconsume for maven build --> org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** +org/jboss/test/ws/jaxws/smoke/tools/** +org/jboss/test/ws/benchmark/** +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/** +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/** +org/jboss/test/ws/jaxws/samples/wssecurity/** + +# [JBWS-2167] Fix samples jaxr for maven build +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-2168] Fix samples bpel for maven build +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# [JBWS-2169] Fix samples jaxrpc for maven build +org/jboss/test/ws/jaxrpc/samples/docstyle/** +org/jboss/test/ws/jaxrpc/samples/dynamichandler/** +org/jboss/test/ws/jaxrpc/samples/exception/** +org/jboss/test/ws/jaxrpc/samples/handler/** +org/jboss/test/ws/jaxrpc/samples/holder/** +org/jboss/test/ws/jaxrpc/samples/jmstransport/** +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** +org/jboss/test/ws/jaxrpc/samples/jsr109pojo/** +org/jboss/test/ws/jaxrpc/samples/message/** +org/jboss/test/ws/jaxrpc/samples/oneway/** +org/jboss/test/ws/jaxrpc/samples/rpcstyle/** +org/jboss/test/ws/jaxrpc/samples/secureejb/** +org/jboss/test/ws/jaxrpc/samples/wsaddr/** +org/jboss/test/ws/jaxrpc/samples/wsbpel/** +org/jboss/test/ws/jaxrpc/samples/wssecurity/** + +# [JBWS-2170] Fix embedded for maven build +org/jboss/test/ws/embedded/** + Modified: stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-01 12:20:20 UTC (rev 6833) +++ stack/native/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-01 19:48:31 UTC (rev 6834) @@ -58,3 +58,36 @@ # [JBWS-2163] wsconsume for maven build --> org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** +org/jboss/test/ws/jaxws/smoke/tools/** +org/jboss/test/ws/benchmark/** +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxws/samples/wssecuritypolicy/** +org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/** +org/jboss/test/ws/jaxws/samples/wssecurity/** + +# [JBWS-2167] Fix samples jaxr for maven build +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-2168] Fix samples bpel for maven build +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# [JBWS-2169] Fix samples jaxrpc for maven build +org/jboss/test/ws/jaxrpc/samples/docstyle/** +org/jboss/test/ws/jaxrpc/samples/dynamichandler/** +org/jboss/test/ws/jaxrpc/samples/exception/** +org/jboss/test/ws/jaxrpc/samples/handler/** +org/jboss/test/ws/jaxrpc/samples/holder/** +org/jboss/test/ws/jaxrpc/samples/jmstransport/** +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** +org/jboss/test/ws/jaxrpc/samples/jsr109pojo/** +org/jboss/test/ws/jaxrpc/samples/message/** +org/jboss/test/ws/jaxrpc/samples/oneway/** +org/jboss/test/ws/jaxrpc/samples/rpcstyle/** +org/jboss/test/ws/jaxrpc/samples/secureejb/** +org/jboss/test/ws/jaxrpc/samples/wsaddr/** +org/jboss/test/ws/jaxrpc/samples/wsbpel/** +org/jboss/test/ws/jaxrpc/samples/wssecurity/** + +# [JBWS-2170] Fix embedded for maven build +org/jboss/test/ws/embedded/** +