[jbossws-commits] JBossWS SVN: r12454 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf and 11 other directories.

Author: sergeyb Date: 2010-06-09 17:54:52 -0400 (Wed, 09 Jun 2010) New Revision: 12454 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml Removed: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties Modified: stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt Log: Isolating PicketBox code to the test scope Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/server/pom.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -208,10 +208,6 @@ <groupId>org.jboss.security</groupId> <artifactId>jboss-security-spi</artifactId> </dependency> - <dependency> - <groupId>org.picketbox</groupId> - <artifactId>picketbox-bare</artifactId> - </dependency> <!-- transitve dependencies --> <dependency> Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-09 21:54:52 UTC (rev 12454) @@ -71,12 +71,12 @@ import org.apache.cxf.service.Service; import org.apache.cxf.service.invoker.Invoker; import org.apache.cxf.service.model.BindingOperationInfo; -import org.jboss.security.SecurityContext; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.invocation.EndpointAssociation; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationContext; import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; /** * An abstract CXF invoker @@ -114,11 +114,10 @@ //clear the WebServiceContextImpl's ThreadLocal variable WebServiceContextImpl.clear(); // clear SecurityContext in case it has been propagated - SecurityContext sc = exchange.getInMessage().getContent(SecurityContext.class); - if (sc != null) - { - sc.setSubjectInfo(null); - } + SecurityAdaptor adaptor = exchange.getInMessage().getContent(SecurityAdaptor.class); + if (adaptor != null) { + //TODO: release the propagated state + } } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2010-06-09 21:54:52 UTC (rev 12454) @@ -26,7 +26,6 @@ import javax.naming.NamingException; import org.jboss.security.AuthenticationManager; -import org.picketbox.factories.SecurityFactory; /** * AuthenticationManager loader @@ -36,7 +35,7 @@ */ public class AuthenticationManagerLoader { - public AuthenticationManager getManagerWithJndi() + public AuthenticationManager getManager() { try { @@ -49,21 +48,5 @@ throw new SecurityException("Unable to lookup AuthenticationManager using JNDI"); } } - - public AuthenticationManager getManager(String securityDomainName) - { - SecurityFactory.prepare(); - try - { - return SecurityFactory.getAuthenticationManager(securityDomainName); - } - catch (Exception ex) { - throw new SecurityException("Unable to get Authentication Manager", ex); - } - finally - { - SecurityFactory.release(); - } - } - + } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-06-09 21:54:52 UTC (rev 12454) @@ -33,10 +33,10 @@ import org.apache.cxf.ws.security.wss4j.AbstractUsernameTokenAuthenticatingInterceptor; import org.jboss.logging.Logger; import org.jboss.security.AuthenticationManager; -import org.jboss.security.SecurityContext; -import org.picketbox.config.PicketBoxConfiguration; -import org.picketbox.exceptions.ConfigurationStreamNullException; -import org.picketbox.factories.SecurityFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; /** * Interceptor which authenticates a current principal and populates Subject @@ -47,10 +47,11 @@ public class SubjectCreatingInterceptor extends AbstractUsernameTokenAuthenticatingInterceptor { private static final Logger log = Logger.getLogger(SubjectCreatingInterceptor.class); - private static final String DEFAULT_SECURITY_DOMAIN_NAME = "JBossWS"; - - private String securityDomainName = DEFAULT_SECURITY_DOMAIN_NAME; + + private AuthenticationManagerLoader aml = null; private boolean propagateContext; + private SecurityAdaptorFactory secAdaptorFactory; + public SubjectCreatingInterceptor() { @@ -60,22 +61,26 @@ public SubjectCreatingInterceptor(Map<String, Object> properties) { super(properties); + try + { + aml = AuthenticationManagerLoader.class.newInstance(); + } + catch (Exception ex) + { + String msg = "AuthenticationManager can not be loaded"; + log.error(msg); + throw new SecurityException(msg); + } + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + secAdaptorFactory = spiProvider.getSPI(SecurityAdaptorFactory.class); + } @Override public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created) { - //if (isDigest) - //{ - //verifyUsernameToken(nonce, created); - // CallbackHandler cb = new UsernameTokenCallbackHandler(nonce, created); - // CallbackHandlerPolicyContextHandler.setCaallbackHandler(cb); - //} - - SecurityContext securityContext = getSecurityContext(); - - // authenticate and populate Subject - AuthenticationManager am = securityContext.getAuthenticationManager(); + // authenticate and populate Subject + AuthenticationManager am = aml.getManager(); Principal principal = new SimplePrincipal(name); Subject subject = new Subject(); @@ -96,8 +101,12 @@ if (propagateContext) { - securityContext.getUtil().createSubjectInfo(principal, password, subject); - PhaseInterceptorChain.getCurrentMessage().setContent(SecurityContext.class, securityContext); + SecurityAdaptor adaptor = secAdaptorFactory.newSecurityAdapter(); + adaptor.setPrincipal(principal); + adaptor.setCredential(password); + adaptor.pushSubjectContext(subject, principal, password); + + PhaseInterceptorChain.getCurrentMessage().setContent(SecurityAdaptor.class, adaptor); if (TRACE) log.trace("Security Context has been propagated"); } @@ -106,77 +115,18 @@ @Override public void handleFault(SoapMessage message) { - SecurityContext securityContext = message.getContent(SecurityContext.class); - if (securityContext != null) { - securityContext.setSubjectInfo(null); + SecurityAdaptor adaptor = message.getContent(SecurityAdaptor.class); + if (adaptor != null) { + //TODO: release the propagated state } } - private SecurityContext getSecurityContext() { - SecurityFactory.prepare(); - - try - { - return SecurityFactory.establishSecurityContext(securityDomainName); - } - catch (Exception ex) { - throw new SecurityException("Unable to establish Security Context for domain " - + securityDomainName, ex); - } - finally - { - SecurityFactory.release(); - } - } - /** - * Loads a custom configuration file, can be used to add the configuration - * for new domains or override the default ones configured by JBoss AS - * - * Note : loading a custom configuration file may affect other endpoints running - * in the same container instance. Example, if some other endpoint depends on - * a default JBossWS security domain and this custom config file overrides JBossWS - * then the other endpoint may get affected - * - * @param configFilePath location of the custom configuration file - */ - public void setSecurityConfigFile(String configFilePath) - { - SecurityFactory.prepare(); - try - { - PicketBoxConfiguration idtrustConfig = new PicketBoxConfiguration(); - idtrustConfig.load(configFilePath); - } - catch (ConfigurationStreamNullException ex) { - throw new SecurityException("Unable to load the configuration file " + configFilePath); - } - catch (Exception ex) { - throw new SecurityException("Unable to read the configuration file " + configFilePath, ex); - } - finally - { - SecurityFactory.release(); - } - } - - /** - * Sets the security domain name. This property has to be set when loading - * a custom configuration file. It also can be used to override the default - * security domain name (JBossWS) - * @param domainName - */ - public void setSecurityDomainName(String domainName) { - securityDomainName = domainName; - } - public void setPropagateContext(boolean propagateContext) { this.propagateContext = propagateContext; } - - /** TODO: JBWS-3028 private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300; private NonceStore nonceStore; Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -14,7 +14,19 @@ <relativePath>../pom.xml</relativePath> </parent> - + <dependencies> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-server</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.picketbox</groupId> + <artifactId>picketbox-bare</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <!-- Profiles --> <profiles> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jaxws.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -194,6 +194,22 @@ </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize/WEB-INF"> <include name="jboss-web.xml"/> + <include name="jbossws-cxf.xml"/> + <include name="wsdl/*"/> + </webinf> + </war> + + <!-- jaxws-samples-wsse-username-authorize-custom --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-authorize-custom.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF"> + <include name="jboss-web.xml"/> <include name="login-config.xml"/> <include name="users.properties"/> <include name="roles.properties"/> @@ -201,7 +217,7 @@ <include name="wsdl/*"/> </webinf> </war> - + <!-- jaxws-samples-wsseEJB --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsseEJB.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -214,6 +230,7 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsseEJB/META-INF"> <include name="jbossws-cxf.xml"/> + <include name="jboss.xml"/> </metainf> </jar> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.util.Collections; +import org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor; +import org.picketbox.config.PicketBoxConfiguration; +import org.picketbox.exceptions.ConfigurationStreamNullException; +import org.picketbox.factories.SecurityFactory; + + +/** + * Interceptor which authenticates a current principal and populates Subject + * + * @author Sergey Beryozkin + * + */ +public class CustomSubjectCreatingInterceptor extends SubjectCreatingInterceptor +{ + + public CustomSubjectCreatingInterceptor() + { + super(Collections.<String, Object> singletonMap("action", "UsernameToken")); + } + + public void setSecurityConfigFile(String configFilePath) + { + SecurityFactory.prepare(); + try + { + PicketBoxConfiguration idtrustConfig = new PicketBoxConfiguration(); + idtrustConfig.load(configFilePath); + } + catch (ConfigurationStreamNullException ex) { + throw new SecurityException("Unable to load the configuration file " + configFilePath); + } + catch (Exception ex) { + throw new SecurityException("Unable to read the configuration file " + configFilePath, ex); + } + finally + { + SecurityFactory.release(); + } + } + + +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java ___________________________________________________________________ Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,127 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.net.URL; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +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.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * WS-Security username authorization test case + * + * @author Sergey Beryozkin + * + */ +public final class UsernameAuthorizationCustomFileTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize-custom"; + private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityServicePort"); + + public static Test suite() + { + return new JBossWSTestSetup(UsernameAuthorizationCustomFileTestCase.class, "jaxws-samples-wsse-username-authorize-custom.war"); + } + + public void testAuthorizedCustomConfig() throws Exception + { + doTestAuthorized(serviceURL, servicePort, "theKermit"); + } + +private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityService"); + URL wsdlURL = new URL(endpointAddress + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class); + setupWsse(proxy, userName); + assertEquals("Secure Hello World!", proxy.sayHello()); + } + + public void testUnauthenticated() throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + setupWsse(proxy, "foo"); + try + { + proxy.sayHello(); + fail("User foo should not be authenticated."); + } + catch (Exception ex) + { + //expected + } + } + + public void testUnauthorizedCustomConfig() throws Exception + { + doTestUnauthorized(serviceURL, servicePort, "theKermit"); + } + +private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityService"); + URL wsdlURL = new URL(endpointAddress + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(portName, ServiceIface.class); + setupWsse(proxy, userName); + try + { + proxy.greetMe(); + fail("User kermit should not be authorized to invoke greetMe."); + } + catch (Exception ex) + { + assertEquals("Unauthorized", ex.getMessage()); + } + } + + private void setupWsse(ServiceIface proxy, String username) + { + Client client = ClientProxy.getClient(proxy); + Endpoint cxfEndpoint = client.getEndpoint(); + + Map<String, Object> outProps = new HashMap<String, Object>(); + outProps.put("action", "UsernameToken"); + outProps.put("user", username); + outProps.put("passwordType", "PasswordText"); + outProps.put("passwordCallbackClass", "org.jboss.test.ws.jaxws.samples.wsse.UsernamePasswordCallback"); + WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps); //request + cxfEndpoint.getOutInterceptors().add(wssOut); + cxfEndpoint.getOutInterceptors().add(new SAAJOutInterceptor()); + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.java ___________________________________________________________________ Name: svn:keywords + Rev Date Name: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2010-06-09 21:54:52 UTC (rev 12454) @@ -47,10 +47,8 @@ public final class UsernameAuthorizationTestCase extends JBossWSTest { private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize/default-config"; - private final String serviceURL2 = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-username-authorize/custom-config"; private final QName servicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityServicePort"); - private final QName servicePort2 = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityServicePort2"); public static Test suite() { @@ -62,13 +60,8 @@ doTestAuthorized(serviceURL, servicePort, "kermit"); } - public void testAuthorizedCustomConfig() throws Exception +private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception { - doTestAuthorized(serviceURL2, servicePort2, "theKermit"); - } - - private void doTestAuthorized(String endpointAddress, QName portName, String userName) throws Exception - { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityService"); URL wsdlURL = new URL(endpointAddress + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); @@ -100,11 +93,6 @@ doTestUnauthorized(serviceURL, servicePort, "kermit"); } - public void testUnauthorizedCustomConfig() throws Exception - { - doTestUnauthorized(serviceURL2, servicePort2, "theKermit"); - } - private void doTestUnauthorized(String endpointAddress, QName portName, String userName) throws Exception { QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity";, "SecurityService"); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -43,38 +43,5 @@ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> </jaxws:inInterceptors> </jaxws:endpoint> - - <bean id="SecurityContextIn2" class="org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor"> - <constructor-arg> - <map> - <entry key="action" value="UsernameToken"/> - </map> - </constructor-arg> - <property name="securityConfigFile" value="login-config.xml"/> - <property name="securityDomainName" value="custom"/> - </bean> - - <util:map id="methodPermissions2"> - <entry key="sayHello" value="theFriends"/> - <entry key="greetMe" value="theSnoopies"/> - </util:map> - - <bean id="AuthorizeIn2" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor"> - <property name="methodRolesMap" ref="methodPermissions2"/> - </bean> - - <jaxws:endpoint - id='ServiceImpl2' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/custom-config' - implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl' - endpointName="ns:SecurityServicePort2" - serviceName="ns:SecurityService" - xmlns:ns="http://www.jboss.org/jbossws/ws-extensions/wssecurity"... - <jaxws:inInterceptors> - <ref bean="SecurityContextIn2"/> - <ref bean="AuthorizeIn2"/> - <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> - </jaxws:inInterceptors> - </jaxws:endpoint> </beans> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/login-config.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -1,16 +0,0 @@ -<?xml version='1.0'?> - -<policy xmlns="urn:jboss:security-config:5.0" -> - - <application-policy name="custom"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - </login-module> - </authentication> - </application-policy> - - -</policy> - Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/roles.properties 2010-06-09 21:54:52 UTC (rev 12454) @@ -1,2 +0,0 @@ -# A sample roles.properties file for use with the UsersRolesLoginModule -theKermit=theFriends Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/users.properties 2010-06-09 21:54:52 UTC (rev 12454) @@ -1,2 +0,0 @@ -# A sample users.properties file for use with the UsersRolesLoginModule -theKermit=thefrog2 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/web.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -10,18 +10,10 @@ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class> </servlet> - <servlet> - <servlet-name>TestService2</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class> - </servlet> - <servlet-mapping> <servlet-name>TestService</servlet-name> <url-pattern>/default-config/*</url-pattern> </servlet-mapping> - <servlet-mapping> - <servlet-name>TestService2</servlet-name> - <url-pattern>/custom-config/*</url-pattern> - </servlet-mapping> + </web-app> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <security-domain>java:/jaas/custom</security-domain> +</jboss-web> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,40 @@ +<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' + xmlns:util='http://www.springframework.org/schema/util' + xsi:schemaLocation='http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util-2.0.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="SecurityContextIn" class="org.jboss.test.ws.jaxws.samples.wsse.CustomSubjectCreatingInterceptor"> + <property name="securityConfigFile" value="login-config.xml"/> + </bean> + + <util:map id="methodPermissions"> + <entry key="sayHello" value="theFriends"/> + <entry key="greetMe" value="theSnoopies"/> + </util:map> + + <bean id="AuthorizeIn" class="org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor"> + <property name="methodRolesMap" ref="methodPermissions"/> + </bean> + + <jaxws:endpoint + id='ServiceImpl' + address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize-custom' + implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'> + <jaxws:inInterceptors> + <ref bean="SecurityContextIn"/> + <ref bean="AuthorizeIn"/> + <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/> + </jaxws:inInterceptors> + </jaxws:endpoint> + +</beans> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/jbossws-cxf.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,16 @@ +<?xml version='1.0'?> + +<policy xmlns="urn:jboss:security-config:5.0" +> + + <application-policy name="custom"> + <authentication> + <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" + flag="required"> + </login-module> + </authentication> + </application-policy> + + +</policy> + Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/login-config.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,2 @@ +# A sample roles.properties file for use with the UsersRolesLoginModule +theKermit=theFriends Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/roles.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,2 @@ +# A sample users.properties file for use with the UsersRolesLoginModule +theKermit=thefrog2 Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/users.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app + version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuri... name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/> + </xsd:schema> + </types> + <message name="sayHello"> + <part name="parameters" element="tns:sayHello"/> + </message> + <message name="sayHelloResponse"> + <part name="parameters" element="tns:sayHelloResponse"/> + </message> + <message name="greetMe"> + <part name="parameters" element="tns:greetMe"/> + </message> + <message name="greetMeResponse"> + <part name="parameters" element="tns:greetMeResponse"/> + </message> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + <operation name="greetMe"> + <input message="tns:greetMe"/> + <output message="tns:greetMeResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <operation name="sayHello"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + <operation name="greetMe"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize-custom"/> + </port> + </service> +</definitions> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService.wsdl ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuri... xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:element name="sayHello" type="tns:sayHello"/> + + <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/> + + <xs:complexType name="sayHello"> + <xs:sequence/> + </xs:complexType> + + <xs:complexType name="sayHelloResponse"> + <xs:sequence> + <xs:element name="return" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:element name="greetMe" type="tns:greetMe"/> + + <xs:element name="greetMeResponse" type="tns:greetMeResponse"/> + + <xs:complexType name="greetMe"> + <xs:sequence/> + </xs:complexType> + + <xs:complexType name="greetMeResponse"> + <xs:sequence> + <xs:element name="return" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> +</xs:schema> + Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/username-authorize-custom/WEB-INF/wsdl/SecurityService_schema1.xsd ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Rev Date Name: svn:eol-style + native Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml 2010-06-09 21:54:52 UTC (rev 12454) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> + +<jboss> + <security-domain>java:/jaas/JBossWS</security-domain> +</jboss> Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jboss.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:keywords + Rev Date Name: svn:eol-style + native Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-09 21:54:52 UTC (rev 12454) @@ -58,5 +58,4 @@ # [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available # on AS 5.x -org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.* -org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.* +org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-09 18:03:49 UTC (rev 12453) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-09 21:54:52 UTC (rev 12454) @@ -58,6 +58,5 @@ # [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available # on AS 5.x -org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.* -org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.* +org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*