Author: jim.ma Date: 2015-01-29 02:09:24 -0500 (Thu, 29 Jan 2015) New Revision: 19435 Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf2.xml Removed: stack/cxf/branches/arquillian/etc/ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/SpringMixedTypeTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml Log: Fix bunch of failures run with fast profile;More clean up Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-29 07:09:24 UTC (rev 19435) @@ -94,9 +94,9 @@ <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath> <testResourcesDir>${project.build.directory}/test-resources</testResourcesDir> - <srcUsersProperties>${project.parent.parent.basedir}/etc/application-users.properties</srcUsersProperties> + <srcUsersProperties>${project.build.directory}/test-classes/application-users.properties</srcUsersProperties> <destUsersProperties>${jboss.home}/standalone/configuration/application-users.properties</destUsersProperties> - <srcRolesProperties>${project.parent.parent.basedir}/etc/application-roles.properties</srcRolesProperties> + <srcRolesProperties>${project.build.directory}/test-classes/application-roles.properties</srcRolesProperties> <destRolesProperties>${jboss.home}/standalone/configuration/application-roles.properties</destRolesProperties> </properties> </configuration> Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties 2015-01-29 07:09:24 UTC (rev 19435) @@ -0,0 +1 @@ +kermit=guest Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-roles.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties 2015-01-29 07:09:24 UTC (rev 19435) @@ -0,0 +1 @@ +kermit=0491092837b7e5aef6f270a3b85f8336 Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/application-users.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2015-01-29 07:09:24 UTC (rev 19435) @@ -23,33 +23,27 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; import java.util.Properties; import javax.naming.Context; import javax.xml.namespace.QName; import javax.xml.ws.Service; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.transport.jms.JMSConduit; +import org.apache.cxf.transport.jms.JMSConfiguration; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.transport.jms.JMSConduit; -import org.apache.cxf.transport.jms.JMSConfiguration; import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.ws.jaxws.cxf.jms.HelloWorld; 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; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Test case for deploying an archive with a JMS (SOAP-over-JMS 1.0) and a HTTP endpoints Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java 2015-01-29 07:09:24 UTC (rev 19435) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.cxf.mixtype; - -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.Service; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - -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; - -(a)RunWith(Arquillian.class) -public class MixedTypeTestCase extends JBossWSTest -{ - private final String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype"; - - @Deployment(testable = false) - public static WebArchive createDeployments() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-mixtype.war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne.class) - .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl.class) - .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml"), "jbossws-cxf.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/web.xml")); - return archive; - } - - @Test - @RunAsClient - public void testEndpoint() throws Exception - { - URL wsdlOneURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/mixtype/jaxws-cxf-mixtype?wsdl"); - QName serviceOneName = new QName(targetNS, "ServiceOne"); - Service serviceOne = Service.create(wsdlOneURL, serviceOneName); - EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class); - assertEquals("mixedType", endpoint.echo("mixedType")); - assertEquals(1, endpoint.getCount()); - } - - @Test - @RunAsClient - public void testEJBEndpoint() throws Exception - { - URL wsdlOneURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/mixtype/EJBServiceOne/EJBEndpointOne?wsdl"); - QName serviceOneName = new QName(targetNS, "EJBServiceOne"); - Service serviceOne = Service.create(wsdlOneURL, serviceOneName); - EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class); - assertEquals("mixedType", endpoint.echo("mixedType")); - assertEquals(1, endpoint.getCount()); - } - - -} \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/SpringMixedTypeTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/SpringMixedTypeTestCase.java 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/SpringMixedTypeTestCase.java 2015-01-29 07:09:24 UTC (rev 19435) @@ -23,8 +23,6 @@ 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.Service; @@ -32,17 +30,13 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; -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; - @RunWith(Arquillian.class) public class SpringMixedTypeTestCase extends JBossWSTest { @@ -50,7 +44,7 @@ @Deployment(testable = false) public static WebArchive createDeployments() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-mixtype.war"); + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-spring-mixtype.war"); archive .addManifest() .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne.class) @@ -66,7 +60,7 @@ @RunAsClient public void testEndpoint() throws Exception { - URL wsdlOneURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/mixtype/jaxws-cxf-mixtype?wsdl"); + URL wsdlOneURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/springmixtype/jaxws-spring-mixtype?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class); @@ -78,7 +72,7 @@ @RunAsClient public void testEJBEndpoint() throws Exception { - URL wsdlOneURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/mixtype/EJBServiceOne/EJBEndpointOne?wsdl"); + URL wsdlOneURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/springmixtype/EJBServiceOne/EJBEndpointOne?wsdl"); QName serviceOneName = new QName(targetNS, "EJBServiceOne"); Service serviceOne = Service.create(wsdlOneURL, serviceOneName); EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2015-01-29 07:09:24 UTC (rev 19435) @@ -21,25 +21,26 @@ */ package org.jboss.test.ws.jaxws.cxf.wsrm; +import java.io.File; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + import org.apache.cxf.endpoint.Client; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.WrapThreadContextClassLoader; import org.junit.Test; import org.junit.runner.RunWith; import org.w3c.dom.Element; -import org.jboss.wsf.test.JBossWSTestHelper; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.net.URL; -import java.io.File; - /** * Test the CXF WS-ReliableMessaging * @@ -49,7 +50,7 @@ @RunWith(Arquillian.class) public class BasicDocTestCase extends JBossWSTest { - @Deployment(name="jaxws-cxf-wsrm-basic-doc", order=1, testable = false) + @Deployment(name="jaxws-cxf-wsrm-basic-doc", testable = false) public static WebArchive createDocServerDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-wsrm-basic-doc.war"); archive @@ -61,15 +62,6 @@ return archive; } - @Deployment(name = "jaxws-cxf-wsrm-basic-client", order=2, testable = false) - public static JavaArchive createClientDeployment() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-cxf-wsrm-basic-client.jar"); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/cxf.xml"), "cxf.xml"); - return archive; - } - @Test @RunAsClient public void testWSDLAccess() throws Exception @@ -81,6 +73,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testClient() throws Exception { URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl"); @@ -93,4 +86,15 @@ assertEquals("Hello", retObj); ((Client)port).destroy(); } + + @Override + protected String getClientJarPaths() + { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-cxf-wsrm-basic-client.jar") { + { + archive.addManifest().addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/cxf.xml"), "cxf.xml"); + } + }); + } + } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2015-01-29 07:09:24 UTC (rev 19435) @@ -24,32 +24,26 @@ 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; import javax.xml.ws.Service; +import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; +import org.apache.cxf.endpoint.Client; +import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; -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 username authorization test case * Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java 2015-01-29 07:09:24 UTC (rev 19435) @@ -1,55 +0,0 @@ -/* - * 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.wsse; - -import java.io.File; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.wsf.test.JBossWSTestHelper; - -public final class UsernameDeploymentArchives -{ - public static WebArchive createServerwar() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsse-username.war"); - archive - .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.apache.ws.security\n")) - .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServerUsernamePasswordCallback.class) - .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServiceIface.class) - .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.class) - .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.GreetMe.class) - .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.GreetMeResponse.class) - .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.SayHello.class) - .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.SayHelloResponse.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf.xml"), "jbossws-cxf.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/web.xml")); - return archive; - } - - private UsernameDeploymentArchives() { - //NOOP - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2015-01-29 07:09:24 UTC (rev 19435) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.wsse; +import java.io.File; import java.net.URL; import org.jboss.arquillian.container.test.api.Deployment; @@ -31,6 +32,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,14 +46,29 @@ public final class UsernameServletTestCase extends JBossWSTest { - @Deployment(name="jaxws-samples-wsse-username", order=1, testable = false) //SERVER_WAR + @Deployment(name="jaxws-samples-wsse-username2", order=1, testable = false) //SERVER_WAR public static WebArchive createServerwar() { - return UsernameDeploymentArchives.createServerwar(); + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsse-username2.war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.ws.security\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServerUsernamePasswordCallback.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.GreetMe.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.GreetMeResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.SayHelloResponse.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf2.xml"), "jbossws-cxf.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/web.xml")); + return archive; } - @Deployment(name="jaxws-samples-wsse-username-client", order=2, testable = false) + @Deployment(name="jaxws-samples-wsse-username-client2", order=2, testable = false) public static WebArchive createClientWar() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsse-username-client.war"); + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsse-username-client2.war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" + "Dependencies: org.apache.ws.security,org.jboss.ws.cxf.jbossws-cxf-client services,org.apache.cxf.impl\n")) @@ -84,7 +101,7 @@ private String runTestInContainer(String test) throws Exception { URL url = new URL("http://" + getServerHost() + ":" + getServerPort() - + "/jaxws-samples-wsse-username-client?path=/jaxws-samples-wsse-username&method=" + test + + "/jaxws-samples-wsse-username-client2?path=/jaxws-samples-wsse-username2&method=" + test + "&helper=" + UsernameHelper.class.getName()); return IOUtils.readAndCloseStream(url.openStream()); } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2015-01-29 07:09:24 UTC (rev 19435) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.samples.wsse; +import java.io.File; import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -36,8 +37,11 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,9 +56,24 @@ { private final String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-username"; - @Deployment(testable = false) //SERVER_WAR + @Deployment(name="jaxws-samples-wsse-username", order=1, testable = false) //SERVER_WAR public static WebArchive createServerwar() { - return UsernameDeploymentArchives.createServerwar(); + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsse-username.war"); + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.apache.ws.security\n")) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServerUsernamePasswordCallback.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServiceIface.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.GreetMe.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.GreetMeResponse.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.SayHello.class) + .addClass(org.jboss.test.ws.jaxws.samples.wsse.jaxws.SayHelloResponse.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf.xml"), "jbossws-cxf.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl"), "wsdl/SecurityService.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd"), "wsdl/SecurityService_schema1.xsd") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/username/WEB-INF/web.xml")); + return archive; } @Test Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml 2015-01-29 07:09:24 UTC (rev 19435) @@ -2,5 +2,5 @@ <!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>mixtype</context-root> + <context-root>springmixtype</context-root> </jboss-web> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2015-01-29 07:09:24 UTC (rev 19435) @@ -5,11 +5,11 @@ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> <!-- Please note the context-root / path needs to match the values specified in the web.xml / jboss-web.xml descriptors --> - <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/mixtype/jaxws-cxf-mixtype' + <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/springmixtype/jaxws-spring-mixtype' implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl'> </jaxws:endpoint> - <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/mixtype/EJBServiceOne/EJBEndpointOne' + <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/springmixtype/EJBServiceOne/EJBEndpointOne' implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl'> </jaxws:endpoint> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2015-01-28 15:59:05 UTC (rev 19434) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/web.xml 2015-01-29 07:09:24 UTC (rev 19435) @@ -9,6 +9,6 @@ </servlet> <servlet-mapping> <servlet-name>Ep1Servlet</servlet-name> - <url-pattern>/jaxws-cxf-mixtype</url-pattern> + <url-pattern>/jaxws-spring-mixtype</url-pattern> </servlet-mapping> </web-app> Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf2.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf2.xml (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf2.xml 2015-01-29 07:09:24 UTC (rev 19435) @@ -0,0 +1,34 @@ +<beans + xmlns='http://www.springframework.org/schema/beans' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xsi:schemaLocation='http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/jaxws + http://cxf.apache.org/schemas/jaxws.xsd'> + + <bean id="UsernameToken_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"> + <constructor-arg> + <map> + <entry key="action" value="UsernameToken"/> + <!-- <entry key="passwordType" value="PasswordDigest"/> --> + <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ServerUsernamePasswordCallback"/> + </map> + </constructor-arg> + </bean> + + <jaxws:endpoint + id='ServiceImpl' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username2' + implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'> + <jaxws:inInterceptors> + <ref bean="UsernameToken_Request"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> + </jaxws:inInterceptors> + </jaxws:endpoint> + + +</beans> Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf2.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native