Author: thomas.diesler(a)jboss.com Date: 2008-05-09 16:58:51 -0400 (Fri, 09 May 2008) New Revision: 6994 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1384/wstools-config.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws958/wstools-config.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/wsdl2javaconfig.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/xsd2javaconfig.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-160/jbossws/simple/simplecaseconfig.xml stack/native/trunk/modules/testsuite/pom.xml Log: Replace test-resources with @test.resources.directory@ Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1384/wstools-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1384/wstools-config.xml 2008-05-09 20:27:32 UTC (rev 6993) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1384/wstools-config.xml 2008-05-09 20:58:51 UTC (rev 6994) @@ -13,7 +13,7 @@ <package-namespace package="org.jboss.test.ws.jaxrpc.jbws1384" namespace="http://org.jboss.test.webservice/samples2"/> </global> - <wsdl-java location="test-resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl"> + <wsdl-java location=&quot;@test.resources.directory(a)/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl&quot;&gt; <mapping file="jaxrpc-mapping.xml" /> <webservices servlet-link="ExampleService" /> </wsdl-java> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws958/wstools-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws958/wstools-config.xml 2008-05-09 20:27:32 UTC (rev 6993) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws958/wstools-config.xml 2008-05-09 20:58:51 UTC (rev 6994) @@ -12,7 +12,7 @@ <global> <package-namespace package="org.jboss.test.ws.jaxrpc.jbws958" namespace="http://services.iplsprovisioning.tsi.com"/> </global> - <wsdl-java location="test-resources/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl"> + <wsdl-java location=&quot;@test.resources.directory(a)/jaxrpc/jbws958/WEB-INF/wsdl/IPLSProvisioning.wsdl&quot;&gt; <mapping file="jaxrpc-mapping.xml" /> </wsdl-java> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2008-05-09 20:27:32 UTC (rev 6993) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml 2008-05-09 20:58:51 UTC (rev 6994) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> <key-store-file>WEB-INF/wsse.keystore</key-store-file> - <key-store-password&gt;{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/test-classes org.jboss.test.ws.jaxrpc.samples.wssecurity.PasswordUtil @tests.output.dir(a)/test-resources/jaxrpc/samples/wssecurity/keystore.password&lt;/key-store-password&gt; + <key-store-password&gt;{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/test-classes org.jboss.test.ws.jaxrpc.samples.wssecurity.PasswordUtil @test.resources.directory(a)/jaxrpc/samples/wssecurity/keystore.password&lt;/key-store-password&gt; <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> - <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/test-resources/jaxrpc/samples/wssecurity/keystore.password</trust-store-password> + <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@test.resources.directory@/jaxrpc/samples/wssecurity/keystore.password</trust-store-password> <config> <sign type="x509v3" alias="wsse"/> <encrypt type="x509v3" alias="wsse"/> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2008-05-09 20:27:32 UTC (rev 6993) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml 2008-05-09 20:58:51 UTC (rev 6994) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> <key-store-file>WEB-INF/wsse.keystore</key-store-file> - <key-store-password&gt;{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/test-classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil @tests.output.dir(a)/test-resources/jaxrpc/wsse/keystore.password&lt;/key-store-password&gt; + <key-store-password&gt;{EXT}@java.home(a)/bin/java -cp @tests.output.dir@/test-classes org.jboss.test.ws.jaxrpc.wsse.PasswordUtil @test.resources.directory(a)/jaxrpc/wsse/keystore.password&lt;/key-store-password&gt; <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> - <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@tests.output.dir@/test-resources/jaxrpc/wsse/keystore.password</trust-store-password> + <trust-store-password>{CLASS}org.jboss.security.plugins.FilePassword:@test.resources.directory@/jaxrpc/wsse/keystore.password</trust-store-password> <config> <sign type="x509v3" alias="wsse"/> <encrypt type="x509v3" alias="wsse"/> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/wsdl2javaconfig.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/wsdl2javaconfig.xml 2008-05-09 20:27:32 UTC (rev 6993) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/wsdl2javaconfig.xml 2008-05-09 20:58:51 UTC (rev 6994) @@ -1,10 +1,7 @@ <!--This is the config file used by jbossws--> <configuration> - <wsdltojava wsdllocation="test-resources/tools/jbws-160/wscompile/simple/wsdl/HelloWsService.wsdl" - packagename="org.jboss.types" - seidir="output/somedir" - servicename="SomeService" > - <mapping directory="output/someMappingDir" - filename="jaxrpc-mapping.xml" /> - </wsdltojava> + <wsdltojava wsdllocation=&quot;@test.resources.directory(a)/tools/jbws-160/wscompile/simple/wsdl/HelloWsService.wsdl&quot; packagename="org.jboss.types" + seidir="output/somedir" servicename="SomeService"> + <mapping directory="output/someMappingDir" filename="jaxrpc-mapping.xml"/> + </wsdltojava> </configuration> \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/xsd2javaconfig.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/xsd2javaconfig.xml 2008-05-09 20:27:32 UTC (rev 6993) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/config/xsd2javaconfig.xml 2008-05-09 20:58:51 UTC (rev 6994) @@ -1,7 +1,4 @@ <!--This is the config file used by jbossws--> -<configuration> - <xsdtojava schemafile="test-resources/somedir/somefile.xsd" - packagename="org.jboss.testtypes" - javadir="output/somedir" - createjavadir="true" /> +<configuration> + <xsdtojava schemafile=&quot;@test.resources.directory(a)/somedir/somefile.xsd&quot; packagename="org.jboss.testtypes" javadir="output/somedir" createjavadir="true"/> </configuration> \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-160/jbossws/simple/simplecaseconfig.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-160/jbossws/simple/simplecaseconfig.xml 2008-05-09 20:27:32 UTC (rev 6993) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbws-160/jbossws/simple/simplecaseconfig.xml 2008-05-09 20:58:51 UTC (rev 6994) @@ -1,22 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--This is the config file used by jbossws--> -<!-- -<configuration> - <wsdltojava wsdllocation="test-resources/tools/jbws-160/wscompile/simple/wsdl/HelloWsService.wsdl" - packagename="org.jboss.types" - seidir="output/resources/tools/jbws-160/jbossws/simple/sei" - servicename="HelloWsService" > - <mapping directory="output/resources/tools/jbws-160/jbossws/simple/mapping" - filename="jaxrpc-mapping.xml" /> - </wsdltojava> -</configuration> ---> - <configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - <wsdlToJava wsdlLocation="test-resources/tools/jbws-160/wscompile/simple/wsdl/HelloWsService.wsdl" + <wsdlToJava wsdlLocation=&quot;@test.resources.directory(a)/tools/jbws-160/wscompile/simple/wsdl/HelloWsService.wsdl&quot; useJavaAnnotations="false"> <mapping fileName="mapping.xml"/> </wsdlToJava> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-09 20:27:32 UTC (rev 6993) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-09 20:58:51 UTC (rev 6994) @@ -18,6 +18,7 @@ <properties> <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args> <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> + <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> </properties> @@ -183,11 +184,11 @@ </property> <property> <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> + <value>${test.archive.directory}</value> </property> <property> <name>test.resources.directory</name> - <value>${project.build.directory}/test-resources</value> + <value>${test.resources.directory}</value> </property> </systemProperties> </configuration>