Author: alessio.soldano(a)jboss.com Date: 2011-04-30 13:00:18 -0400 (Sat, 30 Apr 2011) New Revision: 14215 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/KeystorePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServiceIface.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/SignEncryptTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/SignTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/SayHello.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/SayHelloResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF/alice.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF/alice.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/bob.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/bob.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/jaxws-endpoint-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/META-INF/alice.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/META-INF/alice.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/bob.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/bob.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/jaxws-endpoint-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/SecurityService_schema1.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/jaxws-endpoint-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService_schema1.xsd stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/truststore_abc Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3284] Adding WS-SecurityPolicy tests without Spring descriptors Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-04-30 16:55:22 UTC (rev 14214) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-04-30 17:00:18 UTC (rev 14215) @@ -207,7 +207,85 @@ dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> + + <!-- jaxws-samples-wsse-policy-sign --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/KeystorePasswordCallback.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/sign/WEB-INF"> + <include name="jaxws-endpoint-config.xml"/> + <include name="wsdl/*"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/sign/WEB-INF" prefix="WEB-INF/classes"> + <include name="bob.jks" /> + <include name="bob.properties" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.apache.ws.security"/> + </manifest> + </war> + <!-- jaxws-samples-wsse-policy-sign-client --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/sign/META-INF"> + <include name="alice.properties" /> + <include name="alice.jks" /> + </metainf> + </jar> + + <!-- jaxws-samples-wsse-policy-sign-encrypt --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/KeystorePasswordCallback.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF"> + <include name="jaxws-endpoint-config.xml"/> + <include name="wsdl/*"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF" prefix="WEB-INF/classes"> + <include name="bob.jks" /> + <include name="bob.properties" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.apache.ws.security"/> + </manifest> + </war> + + <!-- jaxws-samples-wsse-policy-sign-encrypt-client --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF"> + <include name="alice.properties" /> + <include name="alice.jks" /> + </metainf> + </jar> + + <!-- jaxws-samples-wsse-policy-username --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/username/WEB-INF"> + <include name="jaxws-endpoint-config.xml"/> + <include name="wsdl/*"/> + </webinf> + <manifest> + <attribute name="Dependencies" value="org.apache.ws.security"/> + </manifest> + </war> + <!-- saaj-soap-connection --> <war warfile="${tests.output.dir}/test-libs/saaj-soap-connection.war" Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/KeystorePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/KeystorePasswordCallback.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/KeystorePasswordCallback.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,70 @@ +/* + * 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.samples.wsse.policy; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.ws.security.WSPasswordCallback; + +public class KeystorePasswordCallback implements CallbackHandler +{ + + private Map<String, String> passwords = new HashMap<String, String>(); + + public KeystorePasswordCallback() + { + passwords.put("alice", "password"); + passwords.put("bob", "password"); + } + + /** + * It attempts to get the password from the private + * alias/passwords map. + */ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException + { + for (int i = 0; i < callbacks.length; i++) + { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[i]; + + String pass = passwords.get(pc.getIdentifier()); + if (pass != null) + { + pc.setPassword(pass); + return; + } + } + } + + /** + * Add an alias/password pair to the callback mechanism. + */ + public void setAliasPassword(String alias, String password) + { + passwords.put(alias, password); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServerUsernamePasswordCallback.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,39 @@ +/* + * 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.samples.wsse.policy; + +import java.io.IOException; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.ws.security.WSPasswordCallback; + +public class ServerUsernamePasswordCallback implements CallbackHandler +{ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException + { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[0]; + if (!("kermit".equals(pc.getIdentifier()) && "thefrog".equals(pc.getPassword()))) + throw new SecurityException("User '" + pc.getIdentifier() + "' with password '" + pc.getPassword() + "' not allowed."); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServiceIface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServiceIface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServiceIface.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,35 @@ +/* + * 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.samples.wsse.policy; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" +) +public interface ServiceIface +{ + @WebMethod + String sayHello(); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServiceImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/ServiceImpl.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,43 @@ +/* + * 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.samples.wsse.policy; + +import javax.jws.WebService; + +import org.jboss.wsf.spi.annotation.EndpointConfig; + +@WebService +( + portName = "SecurityServicePort", + serviceName = "SecurityService", + wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.ServiceIface" +) +@EndpointConfig(configFile = "WEB-INF/jaxws-endpoint-config.xml", configName = "Custom WS-Security Endpoint") +public class ServiceImpl implements ServiceIface +{ + public String sayHello() + { + return "Secure Hello World!"; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/SignEncryptTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/SignEncryptTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/SignEncryptTestCase.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,77 @@ +/* + * 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.samples.wsse.policy; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPFaultException; + +import junit.framework.Test; + +import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * WS-Security Policy sign & encrypt test case + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public final class SignEncryptTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt"; + + public static Test suite() + { + return new JBossWSCXFTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-policy-sign-encrypt-client.jar jaxws-samples-wsse-policy-sign-encrypt.war"); + } + + public void test() throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + setupWsse(proxy); + try + { + assertEquals("Secure Hello World!", proxy.sayHello()); + } + catch (SOAPFaultException e) + { + throw new Exception("Please check that the Bouncy Castle provider is installed.", e); + } + } + + private void setupWsse(ServiceIface proxy) + { + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice"); + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob"); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/SignTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/SignTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/SignTestCase.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,68 @@ +/* + * 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.samples.wsse.policy; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * WS-Security Policy sign test case + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public final class SignTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign"; + + public static Test suite() + { + return new JBossWSCXFTestSetup(SignTestCase.class, "jaxws-samples-wsse-policy-sign-client.jar jaxws-samples-wsse-policy-sign.war"); + } + + public void test() throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + setupWsse(proxy); + assertEquals("Secure Hello World!", proxy.sayHello()); + } + + private void setupWsse(ServiceIface proxy) + { + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); + //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")); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernamePasswordCallback.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernamePasswordCallback.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.policy; + +import java.io.IOException; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.ws.security.WSPasswordCallback; + +public class UsernamePasswordCallback implements CallbackHandler +{ + public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException + { + WSPasswordCallback pc = (WSPasswordCallback)callbacks[0]; + if ("kermit".equals(pc.getIdentifier())) + pc.setPassword("thefrog"); + else + pc.setPassword("wrong password"); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,87 @@ +/* + * 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.samples.wsse.policy; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * WS-Security Policy username test case + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public final class UsernameTestCase extends JBossWSTest +{ + private final String serviceURL = "https://" + getServerHost() + ":8443/jaxws-samples-wsse-policy-username"; + + public static Test suite() + { + System.setProperty("javax.net.ssl.trustStore", "/dati/truststore_abc"); + System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); + System.setProperty("javax.net.ssl.trustStoreType", "jks"); + return new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war"); + } + + public void test() throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + setupWsse(proxy, "kermit"); + assertEquals("Secure Hello World!", proxy.sayHello()); + } + + public void testWrongPassword() throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy";, "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + setupWsse(proxy, "snoopy"); + try + { + proxy.sayHello(); + fail("User snoopy shouldn't be authenticated."); + } + catch (Exception e) + { + //OK + } + } + + private void setupWsse(ServiceIface proxy, String username) + { + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.USERNAME, username); + ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, "org.jboss.test.ws.jaxws.samples.wssePolicy.UsernamePasswordCallback"); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/SayHello.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/SayHello.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/SayHello.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,32 @@ +/* + * 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.samples.wsse.policy.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy") +public class SayHello {} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/SayHelloResponse.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/SayHelloResponse.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/SayHelloResponse.java 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,49 @@ +/* + * 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.samples.wsse.policy.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy") +public class SayHelloResponse +{ + + @XmlElement(name = "return", namespace = "") + private String _return; + + public String getReturn() + { + return this._return; + } + + public void setReturn(String _return) + { + this._return = _return; + } + +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/META-INF/alice.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/META-INF/alice.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/META-INF/alice.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/META-INF/alice.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/META-INF/alice.properties 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=password +org.apache.ws.security.crypto.merlin.keystore.alias=alice +org.apache.ws.security.crypto.merlin.file=META-INF/alice.jks \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/bob.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/bob.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/bob.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/bob.properties 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=password +org.apache.ws.security.crypto.merlin.keystore.alias=bob +org.apache.ws.security.crypto.merlin.file=bob.jks \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/jaxws-endpoint-config.xml 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>Custom WS-Security Endpoint</config-name> + <property> + <property-name>ws-security.signature.properties</property-name> + <property-value>bob.properties</property-value> + </property> + <property> <!-- workaround CXF requiring this even if no encryption is configured --> + <property-name>ws-security.encryption.properties</property-name> + <property-value>bob.properties</property-value> + </property> + <property> + <property-name>ws-security.callback-handler</property-name> + <property-value>org.jboss.test.ws.jaxws.samples.wsse.policy.KeystorePasswordCallback</property-value> + </property> + </endpoint-config> + +</jaxws-config> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/web.xml 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,15 @@ +<?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.policy.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/SecurityService.wsdl 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,96 @@ +<?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/wssecuritypoli... + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + xmlns:wsaws="http://www.w3.org/2005/08/addressing" + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypoli... 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> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityServiceSignPolicy"/> + <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> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign"/> + </port> + </service> + + <wsp:Policy wsu:Id="SecurityServiceSignPolicy" + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding xmlns:sp='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy'> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy... + <wsp:Policy> + <sp:WssX509V3Token10 /> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy... + <wsp:Policy> + <sp:WssX509V3Token10 /> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic256 /> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Strict /> + </wsp:Policy> + </sp:Layout> + <sp:OnlySignEntireHeadersAndBody /> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:Wss10 xmlns:sp='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy'> + <wsp:Policy> + <sp:MustSupportRefEmbeddedToken /> + </wsp:Policy> + </sp:Wss10> + <sp:SignedParts xmlns:sp='http://schemas.xmlsoap.org/ws/2005/07/securitypolicy'> + <sp:Body /> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,18 @@ +<?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/wssecuritypoli... 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:schema> + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF/alice.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF/alice.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF/alice.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF/alice.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/META-INF/alice.properties 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=password +org.apache.ws.security.crypto.merlin.keystore.alias=alice +org.apache.ws.security.crypto.merlin.file=META-INF/alice.jks \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/bob.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/bob.jks ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/bob.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/bob.properties 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,5 @@ +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=password +org.apache.ws.security.crypto.merlin.keystore.alias=bob +org.apache.ws.security.crypto.merlin.file=bob.jks \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/jaxws-endpoint-config.xml 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>Custom WS-Security Endpoint</config-name> + <property> + <property-name>ws-security.signature.properties</property-name> + <property-value>bob.properties</property-value> + </property> + <property> + <property-name>ws-security.encryption.properties</property-name> + <property-value>bob.properties</property-value> + </property> + <property> + <property-name>ws-security.signature.username</property-name> + <property-value>bob</property-value> + </property> + <property> + <property-name>ws-security.encryption.username</property-name> + <property-value>alice</property-value> + </property> + <property> + <property-name>ws-security.callback-handler</property-name> + <property-value>org.jboss.test.ws.jaxws.samples.wsse.policy.KeystorePasswordCallback</property-value> + </property> + </endpoint-config> + +</jaxws-config> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/web.xml 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,15 @@ +<?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.policy.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,102 @@ +<?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/wssecuritypoli... + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + xmlns:wsaws="http://www.w3.org/2005/08/addressing" + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypoli... 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> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityServiceSignThenEncryptPolicy"/> + <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> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt"/> + </port> + </service> + + <wsp:Policy wsu:Id="SecurityServiceSignThenEncryptPolicy" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic... + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic... + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:TripleDesRsa15/> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:EncryptSignature/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:SignBeforeEncrypting/> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... + <sp:Body/> + </sp:SignedParts> + <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... + <sp:Body/> + </sp:EncryptedParts> + <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"... + <wsp:Policy> + <!-- sp:MustSupportRefKeyIdentifier/--> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,18 @@ +<?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/wssecuritypoli... 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:schema> + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/jaxws-endpoint-config.xml 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>Custom WS-Security Endpoint</config-name> + <property> + <property-name>ws-security.callback-handler</property-name> + <property-value>org.jboss.test.ws.jaxws.samples.wsse.policy.ServerUsernamePasswordCallback</property-value> + </property> + </endpoint-config> + +</jaxws-config> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/web.xml 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,15 @@ +<?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.policy.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService.wsdl 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,93 @@ +<?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/wssecuritypoli... + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + xmlns:wsaws="http://www.w3.org/2005/08/addressing" + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypoli... 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> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityServiceBindingPolicy"/> + <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> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wssePolicy-username"/> + </port> + </service> + + <wsp:Policy wsu:Id="SecurityServiceBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <foo:unknownPolicy xmlns:foo="http://cxf.apache.org/not/a/policy"/> + </wsp:All> + <wsp:All> + <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/> + <sp:TransportBinding> + <wsp:Policy> + <sp:TransportToken> + <wsp:Policy> + <sp:HttpsToken RequireClientCertificate="false"/> + </wsp:Policy> + </sp:TransportToken> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:TransportBinding> + <sp:Wss10> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + </wsp:Policy> + </sp:Wss10> + <sp:SignedSupportingTokens> + <wsp:Policy> + <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolic... + <wsp:Policy> + <sp:WssUsernameToken10/> + </wsp:Policy> + </sp:UsernameToken> + </wsp:Policy> + </sp:SignedSupportingTokens> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + +</definitions> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/WEB-INF/wsdl/SecurityService_schema1.xsd 2011-04-30 17:00:18 UTC (rev 14215) @@ -0,0 +1,18 @@ +<?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/wssecuritypoli... 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:schema> + Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/truststore_abc =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/username/truststore_abc ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-30 16:55:22 UTC (rev 14214) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-30 17:00:18 UTC (rev 14215) @@ -648,6 +648,7 @@ <excludes> <!-- # UsernameTestCase requires trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.*</exclude> <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> @@ -787,6 +788,7 @@ <excludes> <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.*</exclude> <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> @@ -901,6 +903,7 @@ <excludes> <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration--> <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/UsernameTestCase.*</exclude> <!--# [CXF-1519] Explicitly set the namespace of a WebFault--> <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>