Author: asoldano Date: 2014-07-03 08:20:47 -0400 (Thu, 03 Jul 2014) New Revision: 18775 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DeploymentArchives.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java Log: [JBWS-3711] WIP conversion of cxf sample tests Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-07-03 10:05:50 UTC (rev 18774) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-07-03 12:20:47 UTC (rev 18775) @@ -54,43 +54,6 @@ dir="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> - <!-- jaxws-samples-schemavalidation --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/Hello*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/ValidatingHello*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/types/*.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> - <manifest> - <attribute name="Dependencies" value="org.apache.cxf"/> - </manifest> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation-client.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/wsf/test/ClientHelper.class"/> - <include name="org/jboss/wsf/test/TestServlet.class"/> - <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/Helper.class"/> - <include name="org/jboss/test/ws/jaxws/samples/schemavalidation/types/*.class"/> - </classes> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation" prefix="WEB-INF/classes"> - <include name="client.wsdl" /> - <include name="validatingClient.wsdl" /> - </zipfileset> - <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF" prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF"> - <include name="jaxws-client-config.xml" /> - </metainf> - </jar> <!-- jaxws-samples-wsa --> <war @@ -213,7 +176,7 @@ </metainf> </jar> - <!-- jaxws-samples-wsse-policy-secconv --> + <!-- jaxws-samples-wsse-policy-secconv <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-secconv.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> @@ -232,7 +195,7 @@ <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> </manifest> - </war> + </war> --> <!-- jaxws-samples-wsse-policy-secconv-client --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-secconv-client.jar"> @@ -686,7 +649,7 @@ </manifest> </war> - <!-- jaxws-samples-wsse-policy-username-jaas --> + <!-- jaxws-samples-wsse-policy-username-jaas <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/web.xml"> @@ -701,11 +664,11 @@ <include name="wsdl/*"/> </webinf> <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> </manifest> - </war> + </war> --> - <!-- jaxws-samples-wsse-policy-username-jaspi --> + <!-- jaxws-samples-wsse-policy-username-jaspi <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-endpoint-jaspi.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/web.xml"> @@ -719,11 +682,11 @@ <include name="wsdl/*"/> </webinf> <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> </manifest> - </war> + </war> --> - <!-- jaxws-samples-wsse-policy-username-jaspi-jbossws --> + <!-- jaxws-samples-wsse-policy-username-jaspi-jbossws <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jbws-jaspi.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/web.xml"> @@ -737,11 +700,11 @@ <include name="wsdl/*"/> </webinf> <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> </manifest> - </war> + </war> --> - <!-- jaxws-samples-wsse-policy-username-jaspi-client --> + <!-- jaxws-samples-wsse-policy-username-jaspi-client <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaspi-client.war" needxmlfile="false"> <classes dir="${tests.output.dir}/test-classes"> @@ -756,11 +719,11 @@ <include name="META-INF/jaxws-client-config.xml"/> </classes> <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> </manifest> - </war> + </war> --> - <!-- jaxws-samples-wsse-policy-username-jaas-digest --> + <!-- jaxws-samples-wsse-policy-username-jaas-digest <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/web.xml"> @@ -775,11 +738,11 @@ <include name="wsdl/*"/> </webinf> <manifest> - <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> <!-- cxf impl required due to custom interceptor in deployment --> + <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl"/> </manifest> - </war> + </war> --> - <!-- jaxws-samples-wsse-policy-username-jaas-ejb --> + <!-- jaxws-samples-wsse-policy-username-jaas-ejb <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-ejb.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/EJB*.class"/> @@ -793,7 +756,7 @@ <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client"/> </manifest> - </jar> + </jar> --> <!-- Please add alphabetically --> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2014-07-03 10:05:50 UTC (rev 18774) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2014-07-03 12:20:47 UTC (rev 18775) @@ -45,7 +45,7 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(DefaultSchemaValidationTestCaseForked.class, "jaxws-samples-schemavalidation-client.war"); + return new JBossWSCXFTestSetup(DefaultSchemaValidationTestCaseForked.class, DeploymentArchives.CLIENT_WAR); } /** @@ -55,10 +55,10 @@ */ public void testDefaultClientValidation() throws Exception { try { - JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); + JBossWSTestHelper.deploy(DeploymentArchives.SERVER); assertEquals("1", runInContainer("testDefaultClientValidation")); } finally { - JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); + JBossWSTestHelper.undeploy(DeploymentArchives.SERVER); } } @@ -77,7 +77,7 @@ "http://" + getServerHost() + ":8080/jaxws-samples-schemavalidation/hello"); HelloResponse hr; try { - JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); + JBossWSTestHelper.deploy(DeploymentArchives.SERVER); hr = proxy.helloRequest("JBoss"); assertNotNull(hr); assertEquals(2, hr.getReturn()); @@ -85,7 +85,7 @@ assertNotNull(hr); assertEquals(2, hr.getReturn()); } finally { - JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); + JBossWSTestHelper.undeploy(DeploymentArchives.SERVER); } // -- modify default conf to enable default endpoint schema validation @@ -93,7 +93,7 @@ { runInContainer("enableDefaultEndpointSchemaValidation"); try { - JBossWSTestHelper.deploy("jaxws-samples-schemavalidation.war"); + JBossWSTestHelper.deploy(DeploymentArchives.SERVER); hr = proxy.helloRequest("JBoss"); assertNotNull(hr); assertEquals(2, hr.getReturn()); @@ -104,7 +104,7 @@ assertTrue(e.getMessage().contains("is not facet-valid with respect to enumeration")); } } finally { - JBossWSTestHelper.undeploy("jaxws-samples-schemavalidation.war"); + JBossWSTestHelper.undeploy(DeploymentArchives.SERVER); } } finally Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DeploymentArchives.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DeploymentArchives.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DeploymentArchives.java 2014-07-03 12:20:47 UTC (rev 18775) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.schemavalidation; + +import java.io.File; + +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.wsf.test.JBossWSTestHelper; + +public final class DeploymentArchives +{ + public static final String SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-schemavalidation.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.cxf\n")) + .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.Hello.class) + .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.HelloImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.ValidatingHelloImpl.class) + .addPackage("org.jboss.test.ws.jaxws.samples.schemavalidation.types") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl"), "wsdl/hello.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/schemavalidation/WEB-INF/web.xml")); + } + }); + + public static final String CLIENT_WAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-samples-schemavalidation-client.war") { { + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.Hello.class) + .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.Helper.class) + .addPackage("org.jboss.test.ws.jaxws.samples.schemavalidation.types") + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/schemavalidation/client.wsdl"), "classes/client.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/schemavalidation/validatingClient.wsdl"), "classes/validatingClient.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/schemavalidation/META-INF/permissions.xml"), "permissions.xml"); + } + }); + + public static final String CLIENT_JAR = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-schemavalidation-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/schemavalidation/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); + } + }); + + private DeploymentArchives() { + //NO OP + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DeploymentArchives.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java 2014-07-03 10:05:50 UTC (rev 18774) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) @@ -47,7 +47,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(SchemaValidationTestCase.class, "jaxws-samples-schemavalidation.war,jaxws-samples-schemavalidation-client.jar"); + return new JBossWSCXFTestSetup(SchemaValidationTestCase.class, DeploymentArchives.SERVER + ", " + DeploymentArchives.CLIENT_JAR); } public void testSchemaValidationEndpoint() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2014-07-03 10:05:50 UTC (rev 18774) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.jaas; +import java.io.File; import java.net.URL; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.namespace.QName; @@ -32,9 +35,12 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * WS-Security Policy username test case leveraging JAAS container integration and using digest passwords. @@ -47,10 +53,33 @@ { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-username-jaas-digest"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-username-jaas-digest.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl\n")) //cxf impl required due to custom interceptor in deployment + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.POJOEndpointAuthorizationInterceptor.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.ServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMe.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMeResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { JBossWSCXFTestSetup testSetup; - testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war"); + testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); Map<String, String> authenticationOptions = new HashMap<String, String>(); authenticationOptions.put("usersProperties", getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2014-07-03 10:05:50 UTC (rev 18774) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.jaas; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -30,8 +33,11 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * WS-SecurityPolicy (v.1.2) UT testcase with JAAS integration (EJB3) @@ -43,9 +49,29 @@ { public final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-username-jaas-ejb/SecurityService/EJBServiceImpl"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-policy-username-jaas-ejb.jar") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.EJBServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMe.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMeResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/ejb/META-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", true); + return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true); } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2014-07-03 10:05:50 UTC (rev 18774) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.jaas; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -30,8 +33,11 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * WS-Security Policy username test case leveraging JAAS container integration. @@ -44,9 +50,32 @@ { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-username-jaas"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-username-jaas.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl\n")) //cxf impl required due to custom interceptor in deployment + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.POJOEndpointAuthorizationInterceptor.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.ServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMe.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMeResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", true); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()), true); } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java 2014-07-03 10:05:50 UTC (rev 18774) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/JaspiAuthenticationTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) @@ -21,8 +21,11 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi; +import java.io.File; import java.net.URL; import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.security.auth.login.Configuration; @@ -35,10 +38,12 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.jboss.security.auth.login.XMLLoginConfigImpl; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * TestCase to demonstrate jaspi authentication * @author <a href="mailto:ema@redhat.com">Jim Ma</a> @@ -48,10 +53,62 @@ private final String serviceEndpointURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-username-endpoint-jaspi"; private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-username-jbws-jaspi"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-username-jbws-jaspi.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.ServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMe.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMeResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/WEB-INF2/jboss-webservices.xml"), "jboss-webservices.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/WEB-INF2/web.xml")); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-username-jaspi-client.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl\n")) + .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.Helper.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.UsernamePasswordCallback.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMe.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMeResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.wsf.test.ClientHelper.class) + .addClass(org.jboss.wsf.test.TestServlet.class); + } + }); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-username-endpoint-jaspi.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.ServiceEndpointImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMe.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMeResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/WEB-INF/jaxws-endpoint-config.xml"), "jaxws-endpoint-config.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaspi/WEB-INF/web.xml")); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } + public static Test suite() { - TestSetup testSetup = new JBossWSCXFTestSetup(JaspiAuthenticationTestCase.class, "jaxws-samples-wsse-policy-username-endpoint-jaspi.war, " + - "jaxws-samples-wsse-policy-username-jbws-jaspi.war , jaxws-samples-wsse-policy-username-jaspi-client.war") { + TestSetup testSetup = new JBossWSCXFTestSetup(JaspiAuthenticationTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())) { public void setUp() throws Exception { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java 2014-07-03 10:05:50 UTC (rev 18774) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java 2014-07-03 12:20:47 UTC (rev 18775) @@ -21,7 +21,10 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.secconv; +import java.io.File; import java.net.URL; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -30,9 +33,12 @@ import junit.framework.Test; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; /** * Secure Conversation testcase @@ -47,17 +53,42 @@ */ public final class SecureConversationTestCase extends JBossWSTest { - private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-secconv/SecureConversationService"; + public static BaseDeployment<?>[] createDeployments() { + List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); + list.add(new JBossWSTestHelper.WarDeployment("jaxws-samples-wsse-policy-secconv.war") { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.secconv.KeystorePasswordCallback.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.secconv.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.secconv.ServiceImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/secconv/WEB-INF/bob.jks"), "classes/bob.jks") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/secconv/WEB-INF/bob.properties"), "classes/bob.properties") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd"); + } + }); + list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-policy-secconv-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/secconv/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/secconv/META-INF/alice.properties"), "alice.properties"); + } + }); + return list.toArray(new BaseDeployment<?>[list.size()]); + } public static Test suite() { - return new JBossWSCXFTestSetup(SecureConversationTestCase.class, "jaxws-samples-wsse-policy-secconv.war,jaxws-samples-wsse-policy-secconv-client.jar"); + return new JBossWSCXFTestSetup(SecureConversationTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); } public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "SecurityService"); - URL wsdlURL = new URL(serviceURL + "?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-secconv/SecureConversationService?wsdl"); Service service = Service.create(wsdlURL, serviceName); ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); setupWsse(proxy, true);