Author: alessio.soldano(a)jboss.com Date: 2008-05-15 07:40:32 -0400 (Thu, 15 May 2008) New Revision: 7040 Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java Log: [JBWS-2181] Move keystores to WEB-INF/classes Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-05-15 11:13:33 UTC (rev 7039) +++ stack/metro/trunk/modules/testsuite/metro-tests/src/scripts/metro-samples-jaxws.xml 2008-05-15 11:40:32 UTC (rev 7040) @@ -57,6 +57,8 @@ </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> </webinf> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> <include name="server-*.jks"/> @@ -66,6 +68,31 @@ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> + + <!-- jaxws-samples-wsse-sign-50 --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-50.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> + <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF" + includes="server-*.jks" + prefix="WEB-INF/classes/META-INF"/> + </war> + + <!-- jaxws-samples-wsse-sign-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar"> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> <include name="client-*.jks"/> @@ -83,16 +110,40 @@ <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> + <include name="jboss-web.xml"/> <include name="wsit-*.xml"/> + <include name="wsdl/*"/> </webinf> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> <include name="server-*.jks"/> <include name="services/**"/> </metainf> + </war> + + <!-- jaxws-samples-wsse-sign-encrypt-50 --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-50.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> + <include name="wsit-*.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="services/**"/> + </metainf> <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF" + includes="server-*.jks" + prefix="WEB-INF/classes/META-INF"/> </war> + + <!-- 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="client-*.jks"/> @@ -119,6 +170,8 @@ dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> + + <!-- jaxws-samples-wsse-username-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.jar"> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF"> <include name="wsit-client.xml"/> Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-05-15 11:13:33 UTC (rev 7039) +++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-05-15 11:40:32 UTC (rev 7040) @@ -26,7 +26,6 @@ import java.net.URLClassLoader; import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import junit.framework.Test; @@ -48,7 +47,7 @@ public static Test suite() { addClientConfToClasspath("jaxws-samples-wsse-sign-encrypt-client.jar"); - return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt.war"); + return new JBossWSTestSetup(SignEncryptTestCase.class, new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-wsse-sign-encrypt-50.war" : "jaxws-samples-wsse-sign-encrypt.war"); } public void test() throws Exception @@ -57,10 +56,6 @@ URL wsdlURL = new URL(serviceURL + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); -// BindingProvider bp = (BindingProvider)proxy; -// bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); -// bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - assertEquals("Secure Hello World!", proxy.sayHello()); } Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-05-15 11:13:33 UTC (rev 7039) +++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-05-15 11:40:32 UTC (rev 7040) @@ -47,7 +47,7 @@ public static Test suite() { addClientConfToClasspath("jaxws-samples-wsse-sign-client.jar"); - return new JBossWSTestSetup(SignTestCase.class, "jaxws-samples-wsse-sign.war"); + return new JBossWSTestSetup(SignTestCase.class, new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-wsse-sign-50.war" : "jaxws-samples-wsse-sign.war"); } public void test() throws Exception Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml 2008-05-15 11:40:32 UTC (rev 7040) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-samples-wsse-sign</context-root> +</jboss-web> \ No newline at end of file Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml 2008-05-15 11:40:32 UTC (rev 7040) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-samples-wsse-sign-encrypt</context-root> +</jboss-web> \ No newline at end of file Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF