January 2015 - jbossws-commits - Jboss List Archives

JBossWS SVN: r19435 - in stack/cxf/branches/arquillian: modules/testsuite/cxf-spring-tests and 7 other directories.

by jbossws-commits＠lists.jboss.org

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'>  - <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="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

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19434 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2015-01-28 10:59:05 -0500 (Wed, 28 Jan 2015) New Revision: 19434 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java Log: Removed obsolete code Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java 2015-01-28 09:40:38 UTC (rev 19433) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java 2015-01-28 15:59:05 UTC (rev 19434) @@ -69,26 +69,6 @@ return archive; } - private static final String PROPERTY_NAME = JBWS_CXF_JAXWS_CLIENT_BUS_SELECTOR; - private static final String SPRING_BUS_SELECTOR = "org.jboss.wsf.stack.cxf.client.SpringCustomClientBusSelector"; - - private String formerValue; - - @Override - protected void setUp() throws Exception { - formerValue = JBossWSTestHelper.setSystemProperty(PROPERTY_NAME, SPRING_BUS_SELECTOR); - JBossWSTestHelper.restartServer(); - super.setUp(); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - JBossWSTestHelper.setSystemProperty(PROPERTY_NAME, formerValue); - JBossWSTestHelper.restartServer(); - formerValue = null; - } - @Test @RunAsClient public void test() throws Exception

9 years, 10 months

1
0
0 / 0

JBossWS SVN: r19433 - in stack/cxf/branches/arquillian/modules: testsuite/cxf-spring-tests and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-28 04:40:38 -0500 (Wed, 28 Jan 2015) New Revision: 19433 Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 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/samples/wssePolicy/UsernameTestCase.java Log: Fix UsernameTestCase Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2015-01-27 21:31:24 UTC (rev 19432) +++ stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2015-01-28 09:40:38 UTC (rev 19433) @@ -66,6 +66,7 @@ public static final String SYSPROP_COPY_JOB_TIMEOUT = "test.copy.job.timeout"; public static final String CXF_TESTS_GROUP_QUALIFIER = "cxf-tests"; public static final String SHARED_TESTS_GROUP_QUALIFIER = "shared-tests"; + public static final String SPRING_TESTS_GROUP_QUALIFIER = "cxf-spring-tests"; private static final int COPY_JOB_TIMEOUT = Integer.getInteger(SYSPROP_COPY_JOB_TIMEOUT, File.pathSeparatorChar == ':' ? 5000 : 60000); //60s on Windows, 5s on UNIX and Mac public JBossWSTest() @@ -235,6 +236,11 @@ { return JBossWSTestHelper.getServerPort(groupQualifier, containerQualifier); } + + public static int getSecureServerPort(String groupQualifier, String containerQualifier) + { + return JBossWSTestHelper.getSecureServerPort(groupQualifier, containerQualifier); + } public static File getArchiveFile(String archive) { Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2015-01-27 21:31:24 UTC (rev 19432) +++ stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2015-01-28 09:40:38 UTC (rev 19433) @@ -217,6 +217,11 @@ return 8080 + getContainerPortOffset(groupQualifier, containerQualifier); } + public static int getSecureServerPort(String groupQualifier, String containerQualifier) + { + return 8443 + getContainerPortOffset(groupQualifier, containerQualifier); + } + protected static int getContainerPortOffset(String groupQualifier, String containerQualifier) { Hashtable<String, String> env = getContainerEnvironment(); 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-27 21:31:24 UTC (rev 19432) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-28 09:40:38 UTC (rev 19433) @@ -107,7 +107,6 @@  -  </plugins> </build> </profile> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-01-27 21:31:24 UTC (rev 19432) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-01-28 09:40:38 UTC (rev 19433) @@ -37,6 +37,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,7 +51,7 @@ public final class UsernameTestCase extends JBossWSTest { final int serverPort = getServerPort(); - final int serverSecurePort = serverPort + 363; //8080 + 363 = 8443 + final int serverSecurePort = JBossWSTest.getSecureServerPort(JBossWSTest.SPRING_TESTS_GROUP_QUALIFIER, "jboss"); private final String serviceURL = "https://" + getServerHost() + ":" + serverSecurePort + "/jaxws-samples-wssePolicy-username"; @Deployment(testable = false) @@ -70,6 +71,7 @@ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/username/WEB-INF/web.xml")); return archive; } + /**** public static Test suite() {

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r19432 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests: src/test/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2015-01-27 16:31:24 -0500 (Tue, 27 Jan 2015) New Revision: 19432 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy Log: Copy pre-configured application-roles.properties and application-users.properties file into standalone/configure directory 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-27 10:06:13 UTC (rev 19431) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-27 21:31:24 UTC (rev 19432) @@ -93,6 +93,11 @@ <rolesPropFile>${project.build.directory}/test-classes/jbossws-roles.properties</rolesPropFile> <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> + <destUsersProperties>${jboss.home}/standalone/configuration/application-users.properties</destUsersProperties> + <srcRolesProperties>${project.parent.parent.basedir}/etc/application-roles.properties</srcRolesProperties> + <destRolesProperties>${jboss.home}/standalone/configuration/application-roles.properties</destRolesProperties> </properties> </configuration> </execution> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-01-27 10:06:13 UTC (rev 19431) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-01-27 21:31:24 UTC (rev 19432) @@ -121,3 +121,17 @@ new XmlNodePrinter(new PrintWriter(writer)).print(root) def f = new File(project.properties['outputFile']) f.write(writer.toString()) + +/* + * copy the preconfigured application-roles.properties and application-users.properties + * files into the standalone/configure directory + */ +def srcUsersProperties = project.properties['srcUsersProperties'] +def destUsersProperties = project.properties['destUsersProperties'] +new AntBuilder().copy( file:srcUsersProperties, + tofile:destUsersProperties) + +def srcRolesProperties = project.properties['srcRolesProperties'] +def destRolesProperties = project.properties['destRolesProperties'] +new AntBuilder().copy( file:srcRolesProperties, + tofile:destRolesProperties) \ No newline at end of file

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r19431 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples: wsse/kerberos and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-27 05:06:13 -0500 (Tue, 27 Jan 2015) New Revision: 19431 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 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/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/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java Log: Fix test failures Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -24,24 +24,12 @@ 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 javax.xml.ws.soap.SOAPFaultException; -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.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; import org.apache.cxf.endpoint.Client; @@ -49,11 +37,17 @@ import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; 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.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.jboss.wsf.test.WrapThreadContextClassLoader; +import org.junit.Test; +import org.junit.runner.RunWith; /** * WS-Security sign & encrypt test case @@ -88,18 +82,9 @@ return archive; } - @Deployment(name="jaxws-samples-wsse-sign-encrypt-client", order=2, testable = false) - public static JavaArchive createDeployment2() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class,("jaxws-samples-wsse-sign-encrypt-client.jar")); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign-encrypt/META-INF/alice.jks"), "alice.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign-encrypt/META-INF/alice.properties"), "alice.properties"); - return archive; - } - @Test @RunAsClient + @WrapThreadContextClassLoader public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService"); @@ -148,4 +133,16 @@ cxfEndpoint.getInInterceptors().add(wssIn); cxfEndpoint.getInInterceptors().add(new SAAJInInterceptor()); } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-sign-encrypt-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign-encrypt/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign-encrypt/META-INF/alice.properties"), "alice.properties"); + } + }); + } + } Modified: 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-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameDeploymentArchives.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -23,16 +23,9 @@ import java.io.File; -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.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTestHelper; public final class UsernameDeploymentArchives 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-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameServletTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -26,23 +26,21 @@ 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.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.ws.common.IOUtils; +import org.jboss.wsf.test.JBossWSTest; import org.junit.Test; import org.junit.runner.RunWith; -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.shrinkwrap.api.asset.StringAsset; - /** * WS-Security username test case * * @author alessio.soldano(a)jboss.com * @since 22-Aug-2010 */ +(a)RunWith(Arquillian.class) public final class UsernameServletTestCase extends JBossWSTest { 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-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -28,23 +28,19 @@ 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.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; - /** * WS-Security username test case * Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -23,39 +23,32 @@ 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.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.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.feature.LoggingFeature; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.policy.WSPolicyFeature; import org.apache.cxf.ws.security.kerberos.KerberosClient; +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.test.ws.jaxws.samples.wsse.kerberos.contract.DoubleItPortType; -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.jboss.wsf.test.WrapThreadContextClassLoader; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; /** - * This test is excluded. Please modify modules/testsuite/pom.xml to enable this test. + * This test is ignored. Please remove @Ignore to enable this test. * Before run this test, a KDC of realm "WS.APACHE.ORG" is required to setup first. * Please look at these two links to find more info about setup a KDC on Fedora and configure it with realm and principals: * https://docs.fedoraproject.org/en-US/Fedora//html/Security_Guide/sect-Sec... @@ -97,12 +90,13 @@ @RunWith(Arquillian.class) +@Ignore("This test requires manually setup KDC") public class KerberosTestCase extends JBossWSTest { private static final String namespace = "http://www.example.org/contract/DoubleIt"; - @Deployment(name="jaxws-samples-wsse-kerberos", order=1, testable = false) + @Deployment(name="jaxws-samples-wsse-kerberos", testable = false) public static WebArchive createDeployment1() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsse-kerberos.war"); archive @@ -124,22 +118,10 @@ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/WEB-INF/web.xml")); return archive; } - - @Deployment(name="jaxws-samples-wsse-kerberos-client", order=2, testable = false) - public static JavaArchive createDeployment2() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class,"jaxws-samples-wsse-kerberos-client.jar"); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos//cxf.xml"), "cxf.xml") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/alice.jks"), "alice.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/alice.properties"), "alice.properties") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.jks"), "bob.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.properties"), "bob.properties"); - return archive; - } - + @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosSupport() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosSupport"; @@ -156,6 +138,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosTransport() throws Exception { final int serverPort = getServerPort(); @@ -174,6 +157,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosSymmetricSupporting() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosOverSymmetricSupporting"; @@ -189,6 +173,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosAsymmetric() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosAsymmetric"; @@ -203,6 +188,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosOverAsymmetricSignedEncrypted() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosOverAsymmetricSignedEncrypted"; @@ -217,6 +203,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void testKerberosKerberosSymmetric() throws Exception { String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-kerberos/DoubleItKerberosSymmetric"; @@ -306,4 +293,19 @@ kerberosClient.setContextName("alice"); cxfEndpoint.put("ws-security.kerberos.client", kerberosClient); } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-kerberos-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos//cxf.xml"), "cxf.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/alice.properties"), "alice.properties") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.jks"), "bob.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.properties"), "bob.properties"); + } + }); + } + } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -22,32 +22,26 @@ package org.jboss.test.ws.jaxws.samples.wssePolicy; import java.io.File; -import java.lang.Exception; import java.net.URL; -import java.net.MalformedURLException; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import javax.xml.ws.soap.SOAPFaultException; +import org.apache.cxf.ws.security.SecurityConstants; 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.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; +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.jboss.wsf.test.WrapThreadContextClassLoader; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.apache.cxf.ws.security.SecurityConstants; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; - /** * WS-Security Policy sign & encrypt test case * @@ -57,7 +51,7 @@ @RunWith(Arquillian.class) public final class SignEncryptTestCase extends JBossWSTest { - @Deployment(name="jaxws-samples-wssePolicy-sign-encrypt", order=1, testable = false) + @Deployment(name="jaxws-samples-wssePolicy-sign-encrypt", testable = false) public static WebArchive createDeployment1() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wssePolicy-sign-encrypt.war"); archive @@ -77,20 +71,9 @@ return archive; } - @Deployment(name="jaxws-samples-wssePolicy-sign-encrypt-client", order=2, testable = false) - public static JavaArchive createDeployment2() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-wssePolicy-sign-encrypt-client.jar"); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.jks"), "alice.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.properties"), "alice.properties"); - return archive; - } - @Test @RunAsClient @WrapThreadContextClassLoader - @OperateOnDeployment("jaxws-samples-wssePolicy-sign-encrypt-client") public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService"); @@ -116,4 +99,15 @@ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice"); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob"); } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wssePolicy-sign-encrypt-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.properties"), "alice.properties"); + } + }); + } } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-01-27 10:06:13 UTC (rev 19431) @@ -23,32 +23,23 @@ 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.BindingProvider; import javax.xml.ws.Service; +import org.apache.cxf.ws.security.SecurityConstants; 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.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; -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; -import org.jboss.wsf.test.JBossWSTestSetup; - /** * WS-Security Policy username test case *

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r19430 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples: wssePolicy and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-27 04:42:15 -0500 (Tue, 27 Jan 2015) New Revision: 19430 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignTestCase.java Log: Fix SignTestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2015-01-27 09:16:08 UTC (rev 19429) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) @@ -24,24 +24,11 @@ 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.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.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.jboss.wsf.test.WrapThreadContextClassLoader; - import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; import org.apache.cxf.endpoint.Client; @@ -49,11 +36,17 @@ import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; 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.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; +import org.jboss.wsf.test.WrapThreadContextClassLoader; +import org.junit.Test; +import org.junit.runner.RunWith; /** * WS-Security sign test case @@ -66,17 +59,7 @@ { private final String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-sign"; - @Deployment(name = "jaxws-samples-wsse-sign-client", order = 1, testable = false) - public static JavaArchive createJarDeployment() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-wsse-sign-client.jar"); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign/META-INF/alice.jks"), "alice.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign/META-INF/alice.properties"), "alice.properties"); - return archive; - } - - @Deployment(name="jaxws-samples-wsse-sign", order=2, testable = false) + @Deployment(name="jaxws-samples-wsse-sign", testable = false) public static WebArchive createDeployment2() { WebArchive archive = ShrinkWrap.create(WebArchive.class,"jaxws-samples-wsse-sign.war"); archive @@ -136,4 +119,15 @@ cxfEndpoint.getInInterceptors().add(wssIn); cxfEndpoint.getInInterceptors().add(new SAAJInInterceptor()); } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-sign-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign/META-INF/alice.properties"), "alice.properties"); + } + }); + } } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignTestCase.java 2015-01-27 09:16:08 UTC (rev 19429) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignTestCase.java 2015-01-27 09:42:15 UTC (rev 19430) @@ -23,30 +23,24 @@ 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; import javax.xml.ws.Service; +import org.apache.cxf.ws.security.SecurityConstants; 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.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; +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.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 sign test case * @@ -58,7 +52,7 @@ { private final String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wssePolicy-sign"; - @Deployment(name="jaxws-samples-wssePolicy-sign", order=1, testable = false) + @Deployment(name="jaxws-samples-wssePolicy-sign", testable = false) public static WebArchive createDeployment1() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wssePolicy-sign.war"); archive @@ -77,18 +71,10 @@ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign/WEB-INF/web.xml")); return archive; } - @Deployment(name="jaxws-samples-wssePolicy-sign-client", order=2, testable = false) - public static JavaArchive createDeployment2() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-wssePolicy-sign-client.jar"); - archive - .addManifest() - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign/META-INF/alice.jks"), "alice.jks") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign/META-INF/alice.properties"), "alice.properties"); - return archive; - } @Test @RunAsClient + @WrapThreadContextClassLoader public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService"); @@ -106,4 +92,16 @@ //workaround CXF requiring this even if no encryption is configured ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); } + + @Override + protected String getClientJarPaths() { + return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-samples-wssePolicy-sign-client.jar") { { + archive + .addManifest() + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign/META-INF/alice.jks"), "alice.jks") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign/META-INF/alice.properties"), "alice.properties"); + } + }); + } + }

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r19429 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss: wsf/test and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-27 04:16:08 -0500 (Tue, 27 Jan 2015) New Revision: 19429 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java Log: Fix ServletTestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java 2015-01-26 22:05:09 UTC (rev 19428) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java 2015-01-27 09:16:08 UTC (rev 19429) @@ -23,25 +23,18 @@ import static org.jboss.wsf.stack.cxf.client.Constants.JBWS_CXF_JAXWS_CLIENT_BUS_SELECTOR; import java.io.File; -import java.lang.Override; import java.net.URL; -import java.util.LinkedList; -import java.util.List; 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.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; /** * [JBWS-3832] Different default Spring descriptor name Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java 2015-01-26 22:05:09 UTC (rev 19428) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java 2015-01-27 09:16:08 UTC (rev 19429) @@ -56,9 +56,7 @@ log.error("Expected instance of " + JBossWSBusFactory.class + " but got: " + factory.getClass()); return false; } - Bus bus = ((JBossWSBusFactory)factory).createBus("cxf.xml"); //force Spring bus construction - assert bus.getOutInterceptors().isEmpty() == true; // cxf-client.xml bus has at least one outinterceptor - + Bus bus = ((JBossWSBusFactory)factory).createBus("cxf.xml"); //force Spring bus construction、 try { BusFactory.setThreadDefaultBus(bus); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java 2015-01-26 22:05:09 UTC (rev 19428) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java 2015-01-27 09:16:08 UTC (rev 19429) @@ -23,23 +23,17 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; 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.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; /** * A testcase for verifying a cxf.xml Spring descriptor based Bus can Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2015-01-26 22:05:09 UTC (rev 19428) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/wsf/test/TestServlet.java 2015-01-27 09:16:08 UTC (rev 19429) @@ -63,7 +63,7 @@ { hostName = "[" + hostName + "]"; } - helper.setTargetEndpoint("http://" + hostName + ":8080" + path); + helper.setTargetEndpoint("http://" + hostName + ":" + req.getLocalPort() + path); List<String> failedTests = new LinkedList<String>(); List<String> errorTests = new LinkedList<String>(); Method[] methods = helper.getClass().getMethods();

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r19428 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2015-01-26 17:05:09 -0500 (Mon, 26 Jan 2015) New Revision: 19428 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java Log: corrected Archive type def Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2015-01-26 22:03:55 UTC (rev 19427) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2015-01-26 22:05:09 UTC (rev 19428) @@ -40,6 +40,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; +import org.jboss.wsf.test.WrapThreadContextClassLoader; import org.apache.cxf.binding.soap.saaj.SAAJInInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; @@ -66,8 +67,8 @@ private final String serviceURL = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-sign"; @Deployment(name = "jaxws-samples-wsse-sign-client", order = 1, testable = false) - public static WebArchive createJarDeployment() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsse-sign-client.jar"); + public static JavaArchive createJarDeployment() { + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-wsse-sign-client.jar"); archive .addManifest() .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/sign/META-INF/alice.jks"), "alice.jks") @@ -99,6 +100,7 @@ @Test @RunAsClient + @WrapThreadContextClassLoader public void test() throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService");

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r19427 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2015-01-26 17:03:55 -0500 (Mon, 26 Jan 2015) New Revision: 19427 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml Log: fixed port reference Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2015-01-26 21:47:48 UTC (rev 19426) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/jbossws-cxf.xml 2015-01-26 22:03:55 UTC (rev 19427) @@ -35,7 +35,7 @@ <jaxws:endpoint id='ServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-sign' implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'> <jaxws:outInterceptors> <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>

9 years, 11 months

1
0
0 / 0

JBossWS SVN: r19426 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples: wssePolicy/sign/WEB-INF and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2015-01-26 16:47:48 -0500 (Mon, 26 Jan 2015) New Revision: 19426 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign/WEB-INF/jbossws-cxf.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign/WEB-INF/wsdl/SecurityService.wsdl Log: fixed port references Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf.xml 2015-01-26 02:43:11 UTC (rev 19425) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username/WEB-INF/jbossws-cxf.xml 2015-01-26 21:47:48 UTC (rev 19426) @@ -22,7 +22,7 @@ <jaxws:endpoint id='ServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username' implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'> <jaxws:inInterceptors> <ref bean="UsernameToken_Request"/> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign/WEB-INF/jbossws-cxf.xml 2015-01-26 02:43:11 UTC (rev 19425) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign/WEB-INF/jbossws-cxf.xml 2015-01-26 21:47:48 UTC (rev 19426) @@ -12,7 +12,7 @@ <jaxws:endpoint id='ServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign' + address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign' implementor='org.jboss.test.ws.jaxws.samples.wssePolicy.ServiceImpl'> <jaxws:properties> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign/WEB-INF/wsdl/SecurityService.wsdl 2015-01-26 02:43:11 UTC (rev 19425) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign/WEB-INF/wsdl/SecurityService.wsdl 2015-01-26 21:47:48 UTC (rev 19426) @@ -41,7 +41,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-sign"/> </port> </service>

9 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2015