Author: asoldano Date: 2015-02-09 06:02:14 -0500 (Mon, 09 Feb 2015) New Revision: 19439 Removed: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/DeploymentArchives.java Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 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/jbws3497/JBWS3497TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/JBWS3670TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java Log: Removing unused imports and files Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -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,18 +30,14 @@ 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.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; - /** * To test configure bean by name auto wire * Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -63,8 +63,8 @@ return archive; } - @Test - @RunAsClient + @Test + @RunAsClient public void testLegalAccess() throws Exception { URL wsdlURL = new URL(endpointURL + "?wsdl"); 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-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/CustomBusServletTestCaseForked.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -20,8 +20,6 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.test.ws.jaxws.cxf.in_container_client; -import static org.jboss.wsf.stack.cxf.client.Constants.JBWS_CXF_JAXWS_CLIENT_BUS_SELECTOR; - import java.io.File; import java.net.URL; Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -25,7 +25,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -38,18 +37,14 @@ 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.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; - /** * [JBWS-3497] Add ability to configure the queue depth on the asynchronous (@Oneway) work queue. * This testcase basically verifies the initial workaround for the issue works. Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/JBWS3670TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/JBWS3670TestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/JBWS3670TestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -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 JBWS3670TestCase extends JBossWSTest { Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/DeploymentArchives.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/DeploymentArchives.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/DeploymentArchives.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -1,61 +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.cxf.wsrm; - -import java.io.File; - -import org.jboss.wsf.test.JBossWSTestHelper; - -public final class DeploymentArchives -{ - public static final String RPC_SERVER = - JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-wsrm-basic-rpc.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml"), "jbossws-cxf.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml")); - } - }); - - public static final String DOC_SERVER = JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-cxf-wsrm-basic-doc.war") { { - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpoint.class) - .addClass(org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml"), "jbossws-cxf.xml") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml")); - } - }); - - public static final String CLIENT = 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"); - } - }); - - public DeploymentArchives() { - //NOOP - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -24,33 +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.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.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.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback; -import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.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.junit.Test; +import org.junit.runner.RunWith; /** * WS-Security username authorization test case @@ -86,27 +79,6 @@ return archive; } - /*** - public static Test suite() - { - JBossWSCXFTestSetup testSetup; - testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - return testSetup; - } - ***/ @Test @RunAsClient public void testAuthorized() throws Exception Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2015-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -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.JavaArchive; +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; - /** * Secure EJB endpoint test * 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-02-09 10:30:36 UTC (rev 19438) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2015-02-09 11:02:14 UTC (rev 19439) @@ -37,7 +37,6 @@ 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; @@ -72,24 +71,6 @@ return archive; } - /**** - public static Test suite() - { - // System properties - currently set at testsuite start time - //System.setProperty("javax.net.ssl.trustStore", "my.truststore"); - //System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); - //System.setProperty("javax.net.ssl.trustStoreType", "jks"); - //System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); - // - JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameTestCase.class, JBossWSTestHelper.writeToFile(createDeployments())); - Map<String, String> sslOptions = new HashMap<String, String>(); - sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore")); - sslOptions.put("server-identity.ssl.keystore-password", "changeit"); - sslOptions.put("server-identity.ssl.alias", "tomcat"); - setup.setHttpsConnectorRequirement(sslOptions); - return setup; - } - *****/ @Test @RunAsClient public void test() throws Exception @@ -124,6 +105,12 @@ private void setupWsse(ServiceIface proxy, String username) { + // System properties - currently set at testsuite start time + //System.setProperty("javax.net.ssl.trustStore", "my.truststore"); + //System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); + //System.setProperty("javax.net.ssl.trustStoreType", "jks"); + //System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); + // ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.USERNAME, username); ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wssePolicy.UsernamePasswordCallback"); }