Author: asoldano Date: 2014-11-24 11:27:07 -0500 (Mon, 24 Nov 2014) New Revision: 19112 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java Log: Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-11-24 16:22:05 UTC (rev 19111) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-11-24 16:27:07 UTC (rev 19112) @@ -21,20 +21,18 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.trust; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; + import org.apache.cxf.Bus; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.trust.STSClient; import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface; import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.ClientCallbackHandler; import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.UsernameTokenCallbackHandler; -import org.jboss.wsf.test.JBossWSCXFTestSetup; -import org.jboss.wsf.test.JBossWSTestHelper; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import java.util.HashMap; -import java.util.Map; - /** * Some client util methods for WS-Trust testcases * @@ -43,18 +41,6 @@ */ public class WSTrustTestUtils { - public static JBossWSCXFTestSetup getTestSetup(Class<?> testClass, String archives) { - JBossWSCXFTestSetup testSetup = new JBossWSCXFTestSetup(testClass, archives); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - JBossWSTestHelper.getResourceFile("jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - JBossWSTestHelper.getResourceFile("jaxws/samples/wsse/policy/trust/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWS-trust-sts", authenticationOptions); - return testSetup; - } - public static void setupWsseAndSTSClient(ServiceIface proxy, Bus bus, String stsWsdlLocation, QName stsService, QName stsPort) { Map<String, Object> ctx = ((BindingProvider) proxy).getRequestContext();