Author: alessio.soldano(a)jboss.com Date: 2008-05-30 08:08:02 -0400 (Fri, 30 May 2008) New Revision: 7232 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml Log: [JBWS-2098] Moving deployed test resource file to WEB-INF/classes Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-05-30 10:59:18 UTC (rev 7231) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2008-05-30 12:08:02 UTC (rev 7232) @@ -62,9 +62,11 @@ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> <include name="jbossws-cxf.xml"/> <include name="wsdl/*"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF" prefix="WEB-INF/classes"> + <include name="bob.jks" /> <include name="bob.properties" /> - <include name="bob.jks" /> - </webinf> + </zipfileset> </war> <!-- jaxws-samples-wsse-sign-client --> @@ -87,12 +89,14 @@ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> <include name="jbossws-cxf.xml"/> <include name="wsdl/*"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF" prefix="WEB-INF/classes"> + <include name="bob.jks" /> <include name="bob.properties" /> - <include name="bob.jks" /> - </webinf> + </zipfileset> </war> - <!-- jaxws-samples-wsse-sign-client-encrypt --> + <!-- jaxws-samples-wsse-sign-encrypt-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar"> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> <include name="alice.properties" /> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties 2008-05-30 10:59:18 UTC (rev 7231) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/bob.properties 2008-05-30 12:08:02 UTC (rev 7232) @@ -2,4 +2,4 @@ org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password org.apache.ws.security.crypto.merlin.keystore.alias=bob -org.apache.ws.security.crypto.merlin.file=WEB-INF/bob.jks \ No newline at end of file +org.apache.ws.security.crypto.merlin.file=bob.jks \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2008-05-30 10:59:18 UTC (rev 7231) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2008-05-30 12:08:02 UTC (rev 7232) @@ -14,7 +14,7 @@ <constructor-arg> <map> <entry key="action" value="Timestamp Signature"/> - <entry key="signaturePropFile" value="WEB-INF/bob.properties"/> + <entry key="signaturePropFile" value="bob.properties"/> <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/> </map> </constructor-arg> @@ -25,7 +25,7 @@ <map> <entry key="action" value="Timestamp Signature"/> <entry key="user" value="bob"/> - <entry key="signaturePropFile" value="WEB-INF/bob.properties"/> + <entry key="signaturePropFile" value="bob.properties"/> <entry key="signatureKeyIdentifier" value="DirectReference"/> <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/> <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401... Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties 2008-05-30 10:59:18 UTC (rev 7231) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/bob.properties 2008-05-30 12:08:02 UTC (rev 7232) @@ -2,4 +2,4 @@ org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password org.apache.ws.security.crypto.merlin.keystore.alias=bob -org.apache.ws.security.crypto.merlin.file=WEB-INF/bob.jks \ No newline at end of file +org.apache.ws.security.crypto.merlin.file=bob.jks \ No newline at end of file Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-30 10:59:18 UTC (rev 7231) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2008-05-30 12:08:02 UTC (rev 7232) @@ -14,8 +14,8 @@ <constructor-arg> <map> <entry key="action" value="Timestamp Signature Encrypt"/> - <entry key="signaturePropFile" value="WEB-INF/bob.properties"/> - <entry key="decryptionPropFile" value="WEB-INF/bob.properties"/> + <entry key="signaturePropFile" value="bob.properties"/> + <entry key="decryptionPropFile" value="bob.properties"/> <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/> </map> </constructor-arg> @@ -26,8 +26,8 @@ <map> <entry key="action" value="Timestamp Signature Encrypt"/> <entry key="user" value="bob"/> - <entry key="signaturePropFile" value="WEB-INF/bob.properties"/> - <entry key="encryptionPropFile" value="WEB-INF/bob.properties"/> + <entry key="signaturePropFile" value="bob.properties"/> + <entry key="encryptionPropFile" value="bob.properties"/> <entry key="encryptionUser" value="Alice"/> <entry key="signatureKeyIdentifier" value="DirectReference"/> <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.KeystorePasswordCallback"/>