September 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16702 - stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-09-10 04:56:21 -0400 (Mon, 10 Sep 2012) New Revision: 16702 Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Endorse jaxws-api.jar Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-09-07 15:05:43 UTC (rev 16701) +++ stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-09-10 08:56:21 UTC (rev 16702) @@ -59,6 +59,7 @@ <patternset id="jbossws.lib.endorsed.patternset"> <include name="**/jbossws-native-factories.jar"/> <include name="**/jaxb-api.jar"/> + <include name="**/jaxws-api.jar"/>  </patternset> <patternset id="jbossws.server.lib.patternset">

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r16701 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-09-07 11:05:43 -0400 (Fri, 07 Sep 2012) New Revision: 16701 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service221Impl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service222Impl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service223Impl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service224Impl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServiceIface.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/META-INF/alice.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/META-INF/alice.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService_schema1.xsd Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml Log: [JBWS-3405] Adding WS-SecurityPolicy Examples 1.0 (2.2.x) testcases Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-06 16:56:10 UTC (rev 16700) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-07 15:05:43 UTC (rev 16701) @@ -122,6 +122,35 @@ </manifest> </war> +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-oasis-22x.war" needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServiceIface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service*Impl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF"> + <include name="wsdl/*"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF" prefix="WEB-INF/classes"> + <include name="bob.jks" /> + <include name="bob.properties" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/> + </manifest> + </war> + +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-oasis-22x-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/META-INF"> + <include name="alice.properties" /> + <include name="alice.jks" /> + </metainf> + </jar> +  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-secconv.war" needxmlfile='false'> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.java 2012-09-07 15:05:43 UTC (rev 16701) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.oasis; + +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/oasis/Service221Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service221Impl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service221Impl.java 2012-09-07 15:05:43 UTC (rev 16701) @@ -0,0 +1,55 @@ +/* + * 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.oasis; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; +import org.jboss.ws.api.annotation.WebContext; + +@WebService +( + portName = "SecurityService221Port", + serviceName = "SecurityService", + wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface" +) +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"), + @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"), + @EndpointProperty(key = "ws-security.signature.username", value = "bob"), + @EndpointProperty(key = "ws-security.encryption.username", value = "useReqSigCert"), + @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback") + } +) +@Stateless +@WebContext(urlPattern = "SecurityService221") +public class Service221Impl implements ServiceIface +{ + public String sayHello() + { + return "Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt"; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service222Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service222Impl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service222Impl.java 2012-09-07 15:05:43 UTC (rev 16701) @@ -0,0 +1,55 @@ +/* + * 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.oasis; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; +import org.jboss.ws.api.annotation.WebContext; + +@WebService +( + portName = "SecurityService222Port", + serviceName = "SecurityService", + wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface" +) +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"), + @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"), + @EndpointProperty(key = "ws-security.signature.username", value = "bob"), + @EndpointProperty(key = "ws-security.encryption.username", value = "useReqSigCert"), + @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback") + } +) +@Stateless +@WebContext(urlPattern = "SecurityService222") +public class Service222Impl implements ServiceIface +{ + public String sayHello() + { + return "Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt"; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service223Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service223Impl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service223Impl.java 2012-09-07 15:05:43 UTC (rev 16701) @@ -0,0 +1,54 @@ +/* + * 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.oasis; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; +import org.jboss.ws.api.annotation.WebContext; + +@WebService +( + portName = "SecurityService223Port", + serviceName = "SecurityService", + wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface" +) +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"), + @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"), + @EndpointProperty(key = "ws-security.signature.username", value = "bob"), + @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback") + } +) +@Stateless +@WebContext(urlPattern = "SecurityService223") +public class Service223Impl implements ServiceIface +{ + public String sayHello() + { + return "Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt"; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service224Impl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service224Impl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service224Impl.java 2012-09-07 15:05:43 UTC (rev 16701) @@ -0,0 +1,55 @@ +/* + * 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.oasis; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; +import org.jboss.ws.api.annotation.WebContext; + +@WebService +( + portName = "SecurityService224Port", + serviceName = "SecurityService", + wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface" +) +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"), + @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"), + @EndpointProperty(key = "ws-security.signature.username", value = "bob"), + @EndpointProperty(key = "ws-security.encryption.username", value = "useReqSigCert"), + @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback") + } +) +@Stateless +@WebContext(urlPattern = "SecurityService224") +public class Service224Impl implements ServiceIface +{ + public String sayHello() + { + return "Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt"; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServiceIface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServiceIface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/ServiceIface.java 2012-09-07 15:05:43 UTC (rev 16701) @@ -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.oasis; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples" +) +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/oasis/WSSecurityPolicyExamples22xTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples22xTestCase.java 2012-09-07 15:05:43 UTC (rev 16701) @@ -0,0 +1,136 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.oasis; + +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.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * WS-Security Policy examples + * + * From OASIS WS-SecurityPolicy Examples Version 1.0 + * + * @author alessio.soldano(a)jboss.com + * @since 07-Sep-2012 + */ +public final class WSSecurityPolicyExamples22xTestCase extends JBossWSTest +{ + private final String NS = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples"; + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-oasis-22x/"; + private final QName serviceName = new QName(NS, "SecurityService"); + + public static Test suite() + { + return new JBossWSCXFTestSetup(WSSecurityPolicyExamples22xTestCase.class, + "jaxws-samples-wsse-policy-oasis-22x.war,jaxws-samples-wsse-policy-oasis-22x-client.jar"); + } + + /** + * 2.2.1 (WSS1.0) X.509 Certificates, Sign, Encrypt + * + * This use-case corresponds to the situation where both parties have X.509v3 certificates (and public-private key pairs). + * The requestor identifies itself to the service. The message exchange is integrity protected and encrypted. + * + * @throws Exception + */ + public void test221() throws Exception + { + Service service = Service.create(new URL(serviceURL + "SecurityService221?wsdl"), serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService221Port"), ServiceIface.class); + setupWsse(proxy); + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) X.509 Certificates, Sign, Encrypt")); + } + + /** + * 2.2.2 (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt + * + * This scenario is based on WSS Interop, Scenario 3, Web Services Security: Interop 1, Draft 06, Editor, Hal Lockhart, BEA Systems + * This use case corresponds to the situation where both parties have X.509v3 certificates (and public-private key pairs). + * The requestor wishes to identify itself to the service using its X.509 credential (strong authentication). + * The message exchange needs to be integrity protected and encrypted as well. The difference from previous use case is + * that the X509 token inserted by the client is included in the message signature (see <ProtectTokens />). + * + * @throws Exception + */ + public void test222() throws Exception + { + Service service = Service.create(new URL(serviceURL + "SecurityService222?wsdl"), serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService222Port"), ServiceIface.class); + setupWsse(proxy); + assertTrue(proxy.sayHello().equals("Hello - (WSS1.0) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + } + + /** + * 2.2.3 (WSS1.1) Anonymous with X.509 Certificate, Sign, Encrypt + * + * In this use case the Request is signed using DerivedKeyToken1(K), then encrypted using a DerivedKeyToken2(K) where K is ephemeral key + * protected for the server's certificate. Response is signed using DKT3(K), (if needed) encrypted using DKT4(K). The requestor does no + * wish to identify himself; the message exchange is protected using derived symmetric keys. As a simpler, but less secure, alternative, + * ephemeral key K (instead of derived keys) could be used for message protection by simply omitting the sp:RequireDerivedKeys assertion. + * + * @throws Exception + */ + public void test223() throws Exception + { + Service service = Service.create(new URL(serviceURL + "SecurityService223?wsdl"), serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService223Port"), ServiceIface.class); + setupWsse(proxy); + assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Anonymous with X.509 Certificates, Sign, Encrypt")); + } + + /** + * 2.2.4 (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt + * + * Client and server X509 certificates are used for client and server authorization respectively. Request is signed using K, then + * encrypted using K, K is ephemeral key protected for server's certificate. Signature corresponding to K is signed using client certificate. + * Response is signed using K, encrypted using K, encrypted key K is not included in response. Alternatively, derived keys can be used for + * each of the encryption and signature operations by simply adding an sp:RequireDerivedKeys assertion. + * + * @throws Exception + */ + public void test224() throws Exception + { + Service service = Service.create(new URL(serviceURL + "SecurityService224?wsdl"), serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(new QName(NS, "SecurityService224Port"), ServiceIface.class); + setupWsse(proxy); + assertTrue(proxy.sayHello().equals("Hello - (WSS1.1) Mutual Authentication with X.509 Certificates, Sign, Encrypt")); + } + + 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/resources/jaxws/samples/wsse/policy/oasis/META-INF/alice.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/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/oasis/META-INF/alice.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/META-INF/alice.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/META-INF/alice.properties 2012-09-07 15:05:43 UTC (rev 16701) @@ -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.keystore.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/oasis/WEB-INF/bob.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/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/oasis/WEB-INF/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/bob.properties 2012-09-07 15:05:43 UTC (rev 16701) @@ -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.keystore.file=bob.jks \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl 2012-09-07 15:05:43 UTC (rev 16701) @@ -0,0 +1,317 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="SecurityService" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples" + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:wsaws="http://www.w3.org/2005/08/addressing" + xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" + targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples"> + <wsdl:types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples" schemaLocation="SecurityService_schema1.xsd"/> + </xsd:schema> + </wsdl:types> + <wsdl:message name="sayHello"> + <wsdl:part name="parameters" element="tns:sayHello"/> + </wsdl:message> + <wsdl:message name="sayHelloResponse"> + <wsdl:part name="parameters" element="tns:sayHelloResponse"/> + </wsdl:message> + <wsdl:portType name="ServiceIface"> + <wsdl:operation name="sayHello"> + <wsdl:input message="tns:sayHello"/> + <wsdl:output message="tns:sayHelloResponse"/> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SecurityService221PortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityService221_policy"/> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction=""/> + <wsdl:input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Input_Policy"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Output_Policy"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="SecurityService222PortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityService222_policy"/> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction=""/> + <wsdl:input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Input_Policy"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Output_Policy"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="SecurityService223PortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityService223_policy"/> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction=""/> + <wsdl:input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Input_Policy"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Output_Policy"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="SecurityService224PortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecurityService224_policy"/> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction=""/> + <wsdl:input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Input_Policy"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Output_Policy"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SecurityService"> + <wsdl:port name="SecurityService221Port" binding="tns:SecurityService221PortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService221"/> + </wsdl:port> + <wsdl:port name="SecurityService222Port" binding="tns:SecurityService222PortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService222"/> + </wsdl:port> + <wsdl:port name="SecurityService223Port" binding="tns:SecurityService223PortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService223"/> + </wsdl:port> + <wsdl:port name="SecurityService224Port" binding="tns:SecurityService224PortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService224"/> + </wsdl:port> + </wsdl:service> +  + <wsp:Policy wsu:Id="SecurityService221_policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> + <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:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:Wss10> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + </wsp:Policy> + </sp:Wss10> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +  + <wsp:Policy wsu:Id="SecurityService222_policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> + <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:IncludeTimestamp/> + <sp:ProtectTokens/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:Wss10> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + </wsp:Policy> + </sp:Wss10> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +  + <wsp:Policy wsu:Id="SecurityService223_policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SymmetricBinding> + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> + <wsp:Policy> + <sp:RequireDerivedKeys/> + <sp:RequireThumbprintReference/> + <sp:WssX509V3Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:ProtectionToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic256/> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:SymmetricBinding> + <sp:Wss11> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + <sp:MustSupportRefThumbprint/> + <sp:MustSupportRefEncryptedKey/> + <sp:RequireSignatureConfirmation/> + </wsp:Policy> + </sp:Wss11> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +  + <wsp:Policy wsu:Id="SecurityService224_policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SymmetricBinding> + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> + <wsp:Policy> + <sp:RequireDerivedKeys/> + <sp:RequireThumbprintReference/> + <sp:WssX509V3Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:ProtectionToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic256/> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:SymmetricBinding> + <sp:EndorsingSupportingTokens> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> + <wsp:Policy> + <sp:RequireThumbprintReference/> + <sp:WssX509V3Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:EndorsingSupportingTokens> + <sp:Wss11> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + <sp:MustSupportRefThumbprint/> + <sp:MustSupportRefEncryptedKey/> + <sp:RequireSignatureConfirmation/> + </wsp:Policy> + </sp:Wss11> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="Input_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="Output_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService_schema1.xsd 2012-09-07 15:05:43 UTC (rev 16701) @@ -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/wssecuritypolicy/oasis-samples" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples" 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> +

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r16700 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-09-06 12:56:10 -0400 (Thu, 06 Sep 2012) New Revision: 16700 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceIface.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/META-INF/alice.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/META-INF/alice.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/bob.jks stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/bob.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService_schema1.xsd Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml Log: [JBWS-2710] Adding WS-SecureConversation testcase Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-06 09:51:51 UTC (rev 16699) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-06 16:56:10 UTC (rev 16700) @@ -122,6 +122,35 @@ </manifest> </war> +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-secconv.war" needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceIface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/secconv/WEB-INF"> + <include name="wsdl/*"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/secconv/WEB-INF" prefix="WEB-INF/classes"> + <include name="bob.jks" /> + <include name="bob.properties" /> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.apache.ws.security,org.apache.cxf"/> + </manifest> + </war> + +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-secconv-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/secconv/META-INF"> + <include name="alice.properties" /> + <include name="alice.jks" /> + </metainf> + </jar> +  <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign.war" Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/KeystorePasswordCallback.java 2012-09-06 16:56:10 UTC (rev 16700) @@ -0,0 +1,71 @@ +/* + * 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.secconv; + +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"); + passwords.put("john", "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/secconv/SecureConversationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java 2012-09-06 16:56:10 UTC (rev 16700) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.secconv; + +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.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Secure Conversation testcase + * + * From OASIS WS-SecurityPolicy Examples Version 1.0: + * + * 2.4.1 (WSS 1.0) Secure Conversation bootstrapped by Mutual + * Authentication with X.509 Certificates + * + * @author alessio.soldano(a)jboss.com + * @since 06-Sep-2012 + */ +public final class SecureConversationTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-secconv/SecureConversationService"; + + public static Test suite() + { + return new JBossWSCXFTestSetup(SecureConversationTestCase.class, "jaxws-samples-wsse-policy-secconv.war,jaxws-samples-wsse-policy-secconv-client.jar"); + } + + 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); + assertTrue(proxy.sayHello().startsWith("Secure Conversation Hello World!")); + assertTrue(proxy.sayHello().startsWith("Secure Conversation Hello World!")); + } + + private void setupWsse(ServiceIface proxy) + { + ((BindingProvider)proxy).getRequestContext().put("ws-security.callback-handler.sct", new KeystorePasswordCallback()); + ((BindingProvider)proxy).getRequestContext().put("ws-security.signature.properties.sct", Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); + ((BindingProvider)proxy).getRequestContext().put("ws-security.encryption.properties.sct", Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties")); + ((BindingProvider)proxy).getRequestContext().put("ws-security.signature.username.sct", "alice"); + ((BindingProvider)proxy).getRequestContext().put("ws-security.encryption.username.sct", "bob"); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceIface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceIface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceIface.java 2012-09-06 16:56:10 UTC (rev 16700) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.secconv; + +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/secconv/ServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/ServiceImpl.java 2012-09-06 16:56:10 UTC (rev 16700) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.secconv; + +import java.util.Calendar; + +import javax.ejb.Stateless; +import javax.jws.WebService; + +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; +import org.jboss.ws.api.annotation.WebContext; + +@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.secconv.ServiceIface" +) +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.encryption.username.sct", value = "useReqSigCert"), + @EndpointProperty(key = "ws-security.encryption.properties.sct", value = "bob.properties"), + @EndpointProperty(key = "ws-security.signature.properties.sct", value = "bob.properties"), + @EndpointProperty(key = "ws-security.callback-handler.sct", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.secconv.KeystorePasswordCallback") +}) +@Stateless +@WebContext(urlPattern = "SecureConversationService") +public class ServiceImpl implements ServiceIface +{ + public String sayHello() + { + return "Secure Conversation Hello World! " + Calendar.getInstance().get(Calendar.MILLISECOND); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/META-INF/alice.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/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/secconv/META-INF/alice.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/META-INF/alice.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/META-INF/alice.properties 2012-09-06 16:56:10 UTC (rev 16700) @@ -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.keystore.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/secconv/WEB-INF/bob.jks =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/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/secconv/WEB-INF/bob.properties =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/bob.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/bob.properties 2012-09-06 16:56:10 UTC (rev 16700) @@ -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.keystore.file=bob.jks \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl 2012-09-06 16:56:10 UTC (rev 16700) @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="SecurityService" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:wsaws="http://www.w3.org/2005/08/addressing" + xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" + xmlns:sp13="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802" + targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy"> + <wsdl:types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" schemaLocation="SecurityService_schema1.xsd"/> + </xsd:schema> + </wsdl:types> + <wsdl:message name="sayHello"> + <wsdl:part name="parameters" element="tns:sayHello"/> + </wsdl:message> + <wsdl:message name="sayHelloResponse"> + <wsdl:part name="parameters" element="tns:sayHelloResponse"/> + </wsdl:message> + <wsdl:portType name="ServiceIface"> + <wsdl:operation name="sayHello"> + <wsdl:input message="tns:sayHello"/> + <wsdl:output message="tns:sayHelloResponse"/> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#SecureConversation_policy"/> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction=""/> + <wsdl:input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Input_Policy"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#Output_Policy"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SecurityService"> + <wsdl:port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-secconv"/> + </wsdl:port> + </wsdl:service> +  +  + <wsp:Policy wsu:Id="SecureConversation_policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SymmetricBinding> + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:SecureConversationToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> + <wsp:Policy> + <sp:RequireDerivedKeys/> + <sp:BootstrapPolicy> + <wsp:Policy> + <sp:AsymmetricBinding> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> +  + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:Wss10> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + </wsp:Policy> + </sp:Wss10> + <sp:SignedParts> + <sp:Body/> + <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/> + </sp:SignedParts> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + </wsp:Policy> + </sp:BootstrapPolicy> + </wsp:Policy> + </sp:SecureConversationToken> + </wsp:Policy> + </sp:ProtectionToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:SymmetricBinding> + <sp:Trust13> + <wsp:Policy> + <sp:RequireClientEntropy/> + <sp:RequireServerEntropy/> + </wsp:Policy> + </sp:Trust13> +  + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="Input_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedParts> + <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="Output_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedParts> + <sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing"/> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService_schema1.xsd 2012-09-06 16:56:10 UTC (rev 16700) @@ -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/wssecuritypolicy" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy" 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> +

12 years, 4 months

1
0
0 / 0

JBossWS SVN: r16699 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-09-06 05:51:51 -0400 (Thu, 06 Sep 2012) New Revision: 16699 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl Log: Minor change to change misleading path name Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl 2012-09-06 03:51:14 UTC (rev 16698) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl 2012-09-06 09:51:51 UTC (rev 16699) @@ -55,7 +55,7 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation" /> + <soap:address location="http://localhost:8080/jaxws-cxf-sec" /> </port> </service> </definitions>

12 years, 4 months

1
0
0 / 0

JBossWS SVN: r16698 - in thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829: systests/jaxws and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-09-05 23:51:14 -0400 (Wed, 05 Sep 2012) New Revision: 16698 Added: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Provider.java thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/cxf4130data.txt thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/resources/wsdl_systest_jaxws/cxf4130.wsdl Modified: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/pom.xml Log: [JBPAPP-9829] Backport CXF-4130: Server using @WebServiceProvider implementation writes contents of SOAP body in SOAP header Modified: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java =================================================================== --- thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java 2012-09-06 03:49:11 UTC (rev 16697) +++ thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java 2012-09-06 03:51:14 UTC (rev 16698) @@ -54,6 +54,7 @@ import org.apache.cxf.message.MessageUtils; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; +import org.apache.cxf.service.model.BindingMessageInfo; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.staxutils.OverlayW3CDOMStreamWriter; import org.apache.cxf.staxutils.StaxUtils; @@ -187,7 +188,7 @@ public void handleMessage(SoapMessage message) throws Fault { MessageContentsList list = (MessageContentsList)message.getContent(List.class); - Object o = list.get(0); + Object o = list.remove(0); SOAPMessage soapMessage = null; if (o instanceof SOAPMessage) { @@ -221,7 +222,9 @@ // Replace stax writer with DomStreamWriter message.setContent(XMLStreamWriter.class, writer); message.setContent(SOAPMessage.class, soapMessage); - + + BindingOperationInfo bop = message.getExchange().get(BindingOperationInfo.class); + DocumentFragment frag = soapMessage.getSOAPPart().createDocumentFragment(); try { Node body = soapMessage.getSOAPBody(); @@ -231,7 +234,25 @@ frag.appendChild(nd); nd = soapMessage.getSOAPBody().getFirstChild(); } - list.set(0, frag); + + int index = 0; + + boolean client = isRequestor(message); + BindingMessageInfo bmsg = null; + + if (client) { + bmsg = bop.getInput(); + } else if (bop.getOutput() != null) { + bmsg = bop.getOutput(); + } + if (bmsg != null && bmsg.getMessageParts() != null + && bmsg.getMessageParts().size() > 0) { + index = bmsg.getMessageParts().get(0).getIndex(); + } + + list.set(index, frag); + + //No need to buffer this as we're already a DOM, //but only do so if someone hasn't actually configured this Object buffer = message @@ -242,7 +263,6 @@ } catch (Exception ex) { throw new Fault(ex); } - BindingOperationInfo bop = message.getExchange().get(BindingOperationInfo.class); if (bop != null && bop.isUnwrapped()) { bop = bop.getWrappedOperation(); message.getExchange().put(BindingOperationInfo.class, bop); Modified: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/pom.xml 2012-09-06 03:49:11 UTC (rev 16697) +++ thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/pom.xml 2012-09-06 03:51:14 UTC (rev 16698) @@ -197,6 +197,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> </dependency> Added: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Provider.java =================================================================== --- thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Provider.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Provider.java 2012-09-06 03:51:14 UTC (rev 16698) @@ -0,0 +1,89 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.provider; + +import java.io.StringReader; + +import javax.annotation.Resource; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.Provider; +import javax.xml.ws.ServiceMode; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceProvider; + +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +@WebServiceProvider(serviceName = "InBandSoapHeaderService", + targetNamespace = "http://cxf.apache.org/soapheader/inband", + portName = "InBandSoapHeaderSoapHttpPort", + wsdlLocation = "/wsdl_systest_jaxws/cxf4130.wsdl") +@ServiceMode(value = javax.xml.ws.Service.Mode.MESSAGE) +public class CXF4130Provider implements Provider<SOAPMessage> { + + @Resource + protected WebServiceContext context; + + public SOAPMessage invoke(SOAPMessage request) { + try { + Document soapBodyDomDocument = request.getSOAPBody().extractContentAsDocument(); + Node node = soapBodyDomDocument.getDocumentElement(); + String requestMsgName = node.getLocalName(); + String responseText = null; + + if ("FooRequest".equals(requestMsgName)) { + responseText = "<SOAP-ENV:Envelope " + + "xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">" + + "<SOAP-ENV:Header>" + + "<FooResponseHeader xmlns:ns2=\"http://cxf.apache.org/soapheader/inband\">" + + "FooResponseHeader</FooResponseHeader>" + + "</SOAP-ENV:Header>" + + "<SOAP-ENV:Body>" + + "<ns2:FooResponse xmlns:ns2=\"http://cxf.apache.org/soapheader/inband\">" + + "<ns2:Return>Foo Response Body</ns2:Return>" + + "</ns2:FooResponse>" + + "</SOAP-ENV:Body>" + + "</SOAP-ENV:Envelope>\n"; + + } else { + throw new WebServiceException("Error in InBand Provider JAX-WS service -- Unknown Request: " + + requestMsgName); + } + + // Create a SOAP request message + MessageFactory soapmsgfactory = MessageFactory.newInstance(); + SOAPMessage responseMessage = soapmsgfactory.createMessage(); + StreamSource responseMessageSrc = null; + + responseMessageSrc = new StreamSource(new StringReader(responseText)); + responseMessage.getSOAPPart().setContent(responseMessageSrc); + responseMessage.saveChanges(); + + return responseMessage; + + } catch (Exception e) { + throw new WebServiceException(e); + } + + } + +} Added: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java =================================================================== --- thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java 2012-09-06 03:51:14 UTC (rev 16698) @@ -0,0 +1,96 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.systest.provider; + + +import java.io.InputStream; + +import javax.xml.ws.Endpoint; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.InputStreamRequestEntity; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.cxf.staxutils.StaxUtils; +import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.apache.cxf.testutil.common.TestUtil; +import org.junit.BeforeClass; +import org.junit.Test; + +public class CXF4130Test extends AbstractBusClientServerTestBase { + + public static final String ADDRESS + = "http://localhost:" + TestUtil.getPortNumber(Server.class) + + "/InBand33MessageServiceProvider/InBandSoapHeaderSoapHttpPort"; + + public static class Server extends AbstractBusTestServerBase { + + protected void run() { + Object implementor = new CXF4130Provider(); + Endpoint.publish(ADDRESS, implementor); + } + + public static void main(String[] args) { + try { + Server s = new Server(); + s.start(); + } catch (Exception ex) { + ex.printStackTrace(); + System.exit(-1); + } finally { + System.out.println("done!"); + } + } + } + + @BeforeClass + public static void startServers() throws Exception { + assertTrue("server did not launch correctly", launchServer(Server.class, true)); + } + + @Test + public void testCxf4130() throws Exception { + InputStream body = getClass().getResourceAsStream("cxf4130data.txt"); + HttpClient client = new HttpClient(); + PostMethod post = new PostMethod(ADDRESS); + post.setRequestEntity(new InputStreamRequestEntity(body, "text/xml")); + client.executeMethod(post); + + Document doc = StaxUtils.read(post.getResponseBodyAsStream()); + Element root = doc.getDocumentElement(); + Node child = root.getFirstChild(); + + boolean foundBody = false; + while (child != null) { + if ("Body".equals(child.getLocalName())) { + foundBody = true; + assertEquals(1, child.getChildNodes().getLength()); + assertEquals("FooResponse", child.getFirstChild().getLocalName()); + } + child = child.getNextSibling(); + } + assertTrue("Did not find the soap:Body element", foundBody); + } + +} Added: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/cxf4130data.txt =================================================================== --- thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/cxf4130data.txt (rev 0) +++ thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/cxf4130data.txt 2012-09-06 03:51:14 UTC (rev 16698) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:inb="http://cxf.apache.org/soapheader/inband"> + <soapenv:Header> + <inb:FooRequestHeader>?</inb:FooRequestHeader> + </soapenv:Header> + <soapenv:Body> + <inb:FooRequest/> + </soapenv:Body> +</soapenv:Envelope> \ No newline at end of file Added: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/resources/wsdl_systest_jaxws/cxf4130.wsdl =================================================================== --- thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/resources/wsdl_systest_jaxws/cxf4130.wsdl (rev 0) +++ thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/systests/jaxws/src/test/resources/wsdl_systest_jaxws/cxf4130.wsdl 2012-09-06 03:51:14 UTC (rev 16698) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://cxf.apache.org/soapheader/inband" targetNamespace="http://cxf.apache.org/soapheader/inband"> + <types> + <schema elementFormDefault="qualified" targetNamespace="http://cxf.apache.org/soapheader/inband" xmlns="http://www.w3.org/2001/XMLSchema"> +> + <element name="FooRequest"> + <complexType> + <sequence/> + </complexType> + </element> + + <element name="FooResponse"> + <complexType> + <sequence> + <element name="Return" type="string"/> + </sequence> + </complexType> + </element> + + <element name="FooRequestHeader" type="string"/> + <element name="FooResponseHeader" type="string"/> + </schema> + </types> + + <message name="FooRequest"> + <part name="FooRequestHeader" element="tns:FooRequestHeader"/> + <part name="FooRequest" element="tns:FooRequest"/> + </message> + <message name="FooResponse"> + <part name="FooResponseHeader" element="tns:FooResponseHeader"/> + <part name="FooResponse" element="tns:FooResponse"/> + </message> + <portType name="InBandSoapHeaderPortType"> + <operation name="Foo"> + <input name="FooRequest" message="tns:FooRequest"/> + <output name="FooResponse" message="tns:FooResponse"/> + </operation> + </portType> + <binding name="InBandSoapHeaderSoapHttpBinding" type="tns:InBandSoapHeaderPortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="Foo"> + <soap:operation/> + <input> + <soap:header message="tns:FooRequest" part="FooRequestHeader" use="literal"/> + <soap:body parts="FooRequest" use="literal"/> + </input> + <output> + <soap:header message="tns:FooResponse" part="FooResponseHeader" use="literal"/> +  +  +  + <soap:body use="literal"/> + </output> + </operation> + </binding> + + <service name="InBandSoapHeaderService"> + <port name="InBandSoapHeaderSoapHttpPort" binding="tns:InBandSoapHeaderSoapHttpBinding"> + <soap:address location="http://localhost:5640/InBand33MessageServiceProvider/InBandSoapHeaderSoap..."/> + </port> + </service> +</definitions>

12 years, 4 months

1
0
0 / 0

JBossWS SVN: r16697 - thirdparty/cxf/branches.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-09-05 23:49:11 -0400 (Wed, 05 Sep 2012) New Revision: 16697 Added: thirdparty/cxf/branches/cxf-2.4.6-patch-01_JBPAPP-9829/ Log: [JBPAPP-9829] creating one off branch

12 years, 4 months

1
0
0 / 0

JBossWS SVN: r16696 - in stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests: src/test/java/org/jboss/test/ws/jaxws/bp12 and 18 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2012-09-05 05:27:00 -0400 (Wed, 05 Sep 2012) New Revision: 16696 Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/ObjectFactory.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/Test1189TestCase.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/WsaTestPortType.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/WsaTestPortTypeImpl.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/ObjectFactory.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/Test1189AnonTestCase.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/WsaTestPortType.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/WsaTestPortTypeImpl.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/ObjectFactory.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/Test1189NonAnonTestCase.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/WsaTestPortType.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/WsaTestPortTypeImpl.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/web.xml stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing.wsdl stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing0.wsdl stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing0.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing1.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/SignatureDocLit0.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Test1189-Anon.wsdl stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/web.xml stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing.wsdl stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing0.wsdl stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing0.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing1.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/SignatureDocLit0.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Test1189-NonAnon.wsdl stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/web.xml stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing.wsdl stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing0.wsdl stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing0.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing1.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/SignatureDocLit0.xsd stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Test1189.wsdl Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/BaseTypesDocTestCase.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/baserpc/BaseTypesRPCTestCase.java stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/complexrpc/WEB-INF/web.xml Log: Add testcases for test1189 wsdl Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/scripts/cxf-jars-jaxws.xml 2012-09-04 16:28:07 UTC (rev 16695) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/scripts/cxf-jars-jaxws.xml 2012-09-05 09:27:00 UTC (rev 16696) @@ -91,8 +91,40 @@ <webinf dir="${tests.output.dir}/test-resources/jaxws/bp12/complexdoc/WEB-INF"> <include name="wsdl/*" /> </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-bp12test1189.war" webxml="${tests.output.dir}/test-resources/jaxws/bp12/wsa/test1189/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/bp12/wsa/test1189/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/bp12/wsa/test1189/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/bp12/wsa/test1189/WEB-INF"> + <include name="wsdl/*" /> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-bp12test1189-anon.war" webxml="${tests.output.dir}/test-resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/bp12/wsa/test1189-anon/WEB-INF"> + <include name="wsdl/*" /> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-bp12test1189-nonanon.war" webxml="${tests.output.dir}/test-resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF"> + <include name="wsdl/*" /> + </webinf> </war> - </target> Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/BaseTypesDocTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/BaseTypesDocTestCase.java 2012-09-04 16:28:07 UTC (rev 16695) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/BaseTypesDocTestCase.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -54,7 +54,7 @@ Service service = Service.create(wsdlURL, serviceName); IBaseDataTypesDocLitW port = (IBaseDataTypesDocLitW) service.getPort(IBaseDataTypesDocLitW.class); // invoke method - //((BindingProvider)port).getRequestContext().put("org.apache.cxf.message.Message.ENCODING", "UTF-16"); + ((BindingProvider)port).getRequestContext().put("org.apache.cxf.message.Message.ENCODING", "UTF-16"); ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:9090/jaxws-bp12basedoc-utf16/BPBaseDoc"); System.out.println("Invoking retInt..."); int _retInt_inInt = 10; Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/baserpc/BaseTypesRPCTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/baserpc/BaseTypesRPCTestCase.java 2012-09-04 16:28:07 UTC (rev 16695) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/baserpc/BaseTypesRPCTestCase.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -54,7 +54,7 @@ Service service = Service.create(wsdlURL, serviceName); IBaseDataTypesRpcLit port = (IBaseDataTypesRpcLit) service.getPort(IBaseDataTypesRpcLit.class); // invoke method - ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost/jaxws-bp12baserpc/BPBaseRPC"); + ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8080/jaxws-bp12baserpc/BPBaseRPC"); System.out.println("Invoking retInt..."); int _retInt_inInt = 10; int _retInt__return = port.retInt(_retInt_inInt); Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/ObjectFactory.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/ObjectFactory.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/ObjectFactory.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,279 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189; + +import java.math.BigDecimal; +import java.math.BigInteger; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.bp12.wsa.test1189 package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _EchoIn_QNAME = new QName("http://example.org/echo", "echoIn"); + private final static QName _UnsignedShort_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedShort"); + private final static QName _EchoOut_QNAME = new QName("http://example.org/echo", "echoOut"); + private final static QName _Double_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "double"); + private final static QName _Long_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "long"); + private final static QName _Decimal_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "decimal"); + private final static QName _Float_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "float"); + private final static QName _AnyURI_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "anyURI"); + private final static QName _Int_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "int"); + private final static QName _QName_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "QName"); + private final static QName _UnsignedInt_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedInt"); + private final static QName _AnyType_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "anyType"); + private final static QName _Notify_QNAME = new QName("http://example.org/notify", "notify"); + private final static QName _UnsignedByte_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedByte"); + private final static QName _DateTime_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "dateTime"); + private final static QName _Boolean_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "boolean"); + private final static QName _UnsignedLong_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedLong"); + private final static QName _Base64Binary_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "base64Binary"); + private final static QName _Duration_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "duration"); + private final static QName _Short_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "short"); + private final static QName _String_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "string"); + private final static QName _Byte_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "byte"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.bp12.wsa.test1189 + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoIn") + public JAXBElement<String> createEchoIn(String value) { + return new JAXBElement<String>(_EchoIn_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedShort") + public JAXBElement<Integer> createUnsignedShort(Integer value) { + return new JAXBElement<Integer>(_UnsignedShort_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoOut") + public JAXBElement<String> createEchoOut(String value) { + return new JAXBElement<String>(_EchoOut_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Double }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "double") + public JAXBElement<Double> createDouble(Double value) { + return new JAXBElement<Double>(_Double_QNAME, Double.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "long") + public JAXBElement<Long> createLong(Long value) { + return new JAXBElement<Long>(_Long_QNAME, Long.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigDecimal }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "decimal") + public JAXBElement<BigDecimal> createDecimal(BigDecimal value) { + return new JAXBElement<BigDecimal>(_Decimal_QNAME, BigDecimal.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "float") + public JAXBElement<Float> createFloat(Float value) { + return new JAXBElement<Float>(_Float_QNAME, Float.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "anyURI") + public JAXBElement<String> createAnyURI(String value) { + return new JAXBElement<String>(_AnyURI_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "int") + public JAXBElement<Integer> createInt(Integer value) { + return new JAXBElement<Integer>(_Int_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link QName }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "QName") + public JAXBElement<QName> createQName(QName value) { + return new JAXBElement<QName>(_QName_QNAME, QName.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedInt") + public JAXBElement<Long> createUnsignedInt(Long value) { + return new JAXBElement<Long>(_UnsignedInt_QNAME, Long.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "anyType") + public JAXBElement<Object> createAnyType(Object value) { + return new JAXBElement<Object>(_AnyType_QNAME, Object.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/notify", name = "notify") + public JAXBElement<String> createNotify(String value) { + return new JAXBElement<String>(_Notify_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedByte") + public JAXBElement<Short> createUnsignedByte(Short value) { + return new JAXBElement<Short>(_UnsignedByte_QNAME, Short.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "dateTime") + public JAXBElement<XMLGregorianCalendar> createDateTime(XMLGregorianCalendar value) { + return new JAXBElement<XMLGregorianCalendar>(_DateTime_QNAME, XMLGregorianCalendar.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "boolean") + public JAXBElement<Boolean> createBoolean(Boolean value) { + return new JAXBElement<Boolean>(_Boolean_QNAME, Boolean.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedLong") + public JAXBElement<BigInteger> createUnsignedLong(BigInteger value) { + return new JAXBElement<BigInteger>(_UnsignedLong_QNAME, BigInteger.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "base64Binary") + public JAXBElement<byte[]> createBase64Binary(byte[] value) { + return new JAXBElement<byte[]>(_Base64Binary_QNAME, byte[].class, null, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Duration }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "duration") + public JAXBElement<Duration> createDuration(Duration value) { + return new JAXBElement<Duration>(_Duration_QNAME, Duration.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "short") + public JAXBElement<Short> createShort(Short value) { + return new JAXBElement<Short>(_Short_QNAME, Short.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "string") + public JAXBElement<String> createString(String value) { + return new JAXBElement<String>(_String_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Byte }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "byte") + public JAXBElement<Byte> createByte(Byte value) { + return new JAXBElement<Byte>(_Byte_QNAME, Byte.class, null, value); + } + +} Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/Test1189TestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/Test1189TestCase.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/Test1189TestCase.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189; + +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.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +public class Test1189TestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-bp12test1189/Test1189"; + + public static Test suite() + { + return new JBossWSCXFTestSetup(Test1189TestCase.class, "jaxws-bp12test1189.war"); + } + + public void testWSA() throws Exception + { + // construct proxy + QName serviceName = new QName("http://tempuri.org/", "wsaTestService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + WsaTestPortType port = (WsaTestPortType) service.getPort(WsaTestPortType.class); + // invoke method + ((BindingProvider) port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + "http://" + getServerHost() + "/jaxws-bp12test1189/Test1189"); + + System.out.println("Invoking echo..."); + String response = port.echo("input string"); + System.out.println("echo.result: " + response); + + + System.out.println("Invoking notify..."); + port.notify("input string"); + + + + + + + } +} \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/WsaTestPortType.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/WsaTestPortType.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/WsaTestPortType.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189; + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.Action; + +@WebService(targetNamespace = "http://example.org", name = "wsaTestPortType") +(a)XmlSeeAlso({ObjectFactory.class}) +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface WsaTestPortType { + + @Oneway + @Action(input = "http://example.org/action/notify") + @WebMethod(operationName = "Notify", action = "http://example.org/action/notify") + public void notify( + @WebParam(partName = "notify", name = "notify", targetNamespace = "http://example.org/notify") + java.lang.String notify + ); + + @WebResult(name = "echoOut", targetNamespace = "http://example.org/echo", partName = "echoOut") + @Action(input = "http://example.org/action/echoIn", output = "http://example.org/action/echoOut") + @WebMethod(operationName = "Echo", action = "http://example.org/action/echoIn") + public java.lang.String echo( + @WebParam(partName = "echoIn", name = "echoIn", targetNamespace = "http://example.org/echo") + java.lang.String echoIn + ); +} Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/WsaTestPortTypeImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/WsaTestPortTypeImpl.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/WsaTestPortTypeImpl.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189; + +(a)javax.jws.WebService( + serviceName = "wsaTestService", + portName = "CustomBinding_wsaTestPortType", + targetNamespace = "http://tempuri.org/", + wsdlLocation = "WEB-INF/wsdl/Test1189.wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.bp12.wsa.test1189.WsaTestPortType") + +public class WsaTestPortTypeImpl implements WsaTestPortType { + + public void notify(java.lang.String notify) { + System.out.println(notify); + } + + public String echo(String echoIn) { + return "return : " + echoIn; + } + +} Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/ObjectFactory.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/ObjectFactory.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/ObjectFactory.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,279 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189.anon; + +import java.math.BigDecimal; +import java.math.BigInteger; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.bp12.wsa.test1189.anon package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _EchoIn_QNAME = new QName("http://example.org/echo", "echoIn"); + private final static QName _UnsignedShort_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedShort"); + private final static QName _EchoOut_QNAME = new QName("http://example.org/echo", "echoOut"); + private final static QName _Double_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "double"); + private final static QName _Long_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "long"); + private final static QName _Float_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "float"); + private final static QName _Decimal_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "decimal"); + private final static QName _AnyURI_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "anyURI"); + private final static QName _Int_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "int"); + private final static QName _QName_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "QName"); + private final static QName _UnsignedInt_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedInt"); + private final static QName _AnyType_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "anyType"); + private final static QName _Notify_QNAME = new QName("http://example.org/notify", "notify"); + private final static QName _UnsignedByte_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedByte"); + private final static QName _DateTime_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "dateTime"); + private final static QName _Boolean_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "boolean"); + private final static QName _UnsignedLong_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedLong"); + private final static QName _Base64Binary_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "base64Binary"); + private final static QName _Duration_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "duration"); + private final static QName _Short_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "short"); + private final static QName _String_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "string"); + private final static QName _Byte_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "byte"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.bp12.wsa.test1189.anon + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoIn") + public JAXBElement<String> createEchoIn(String value) { + return new JAXBElement<String>(_EchoIn_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedShort") + public JAXBElement<Integer> createUnsignedShort(Integer value) { + return new JAXBElement<Integer>(_UnsignedShort_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoOut") + public JAXBElement<String> createEchoOut(String value) { + return new JAXBElement<String>(_EchoOut_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Double }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "double") + public JAXBElement<Double> createDouble(Double value) { + return new JAXBElement<Double>(_Double_QNAME, Double.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "long") + public JAXBElement<Long> createLong(Long value) { + return new JAXBElement<Long>(_Long_QNAME, Long.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "float") + public JAXBElement<Float> createFloat(Float value) { + return new JAXBElement<Float>(_Float_QNAME, Float.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigDecimal }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "decimal") + public JAXBElement<BigDecimal> createDecimal(BigDecimal value) { + return new JAXBElement<BigDecimal>(_Decimal_QNAME, BigDecimal.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "anyURI") + public JAXBElement<String> createAnyURI(String value) { + return new JAXBElement<String>(_AnyURI_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "int") + public JAXBElement<Integer> createInt(Integer value) { + return new JAXBElement<Integer>(_Int_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link QName }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "QName") + public JAXBElement<QName> createQName(QName value) { + return new JAXBElement<QName>(_QName_QNAME, QName.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedInt") + public JAXBElement<Long> createUnsignedInt(Long value) { + return new JAXBElement<Long>(_UnsignedInt_QNAME, Long.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "anyType") + public JAXBElement<Object> createAnyType(Object value) { + return new JAXBElement<Object>(_AnyType_QNAME, Object.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/notify", name = "notify") + public JAXBElement<String> createNotify(String value) { + return new JAXBElement<String>(_Notify_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedByte") + public JAXBElement<Short> createUnsignedByte(Short value) { + return new JAXBElement<Short>(_UnsignedByte_QNAME, Short.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "dateTime") + public JAXBElement<XMLGregorianCalendar> createDateTime(XMLGregorianCalendar value) { + return new JAXBElement<XMLGregorianCalendar>(_DateTime_QNAME, XMLGregorianCalendar.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "boolean") + public JAXBElement<Boolean> createBoolean(Boolean value) { + return new JAXBElement<Boolean>(_Boolean_QNAME, Boolean.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedLong") + public JAXBElement<BigInteger> createUnsignedLong(BigInteger value) { + return new JAXBElement<BigInteger>(_UnsignedLong_QNAME, BigInteger.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "base64Binary") + public JAXBElement<byte[]> createBase64Binary(byte[] value) { + return new JAXBElement<byte[]>(_Base64Binary_QNAME, byte[].class, null, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Duration }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "duration") + public JAXBElement<Duration> createDuration(Duration value) { + return new JAXBElement<Duration>(_Duration_QNAME, Duration.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "short") + public JAXBElement<Short> createShort(Short value) { + return new JAXBElement<Short>(_Short_QNAME, Short.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "string") + public JAXBElement<String> createString(String value) { + return new JAXBElement<String>(_String_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Byte }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "byte") + public JAXBElement<Byte> createByte(Byte value) { + return new JAXBElement<Byte>(_Byte_QNAME, Byte.class, null, value); + } + +} Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/Test1189AnonTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/Test1189AnonTestCase.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/Test1189AnonTestCase.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189.anon; + +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.addressing.AddressingProperties; +import org.apache.cxf.ws.addressing.AttributedURIType; +import org.apache.cxf.ws.addressing.EndpointReferenceType; +import org.apache.cxf.ws.addressing.JAXWSAConstants; +import org.apache.cxf.ws.addressing.impl.AddressingPropertiesImpl; +import org.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +public class Test1189AnonTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-bp12test1189-anon/Test1189Anon"; + + public static Test suite() + { + return new JBossWSCXFTestSetup(Test1189AnonTestCase.class, "jaxws-bp12test1189-anon.war"); + } + + public void testWSA() throws Exception + { + // construct proxy + QName serviceName = new QName("http://tempuri.org/", "wsaTestService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + WsaTestPortType port = (WsaTestPortType) service.getPort(WsaTestPortType.class); + // invoke method + ((BindingProvider) port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + "http://" + getServerHost() + "/jaxws-bp12test1189-anon/Test1189Anon"); + + + EndpointReferenceType wsaTo = new EndpointReferenceType(); + AddressingProperties addrProperties = new AddressingPropertiesImpl(); + AttributedURIType epr = new AttributedURIType(); + epr.setValue( "http://" + getServerHost() + ":9090/jaxws-bp12test1189-anon/Test1189Anon"); + wsaTo.setAddress(epr); + addrProperties.setReplyTo(wsaTo); + ((BindingProvider) port).getRequestContext().put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES, addrProperties); + + try + { + port.echo("input string"); + fail("only anonymous supported fault is expected"); + } + catch (SOAPFaultException e) + { + assertTrue("only anonymous supported error message is expected", e.getMessage().contains("Found non-anonymous address but only anonymous supported")); + } + + + } +} \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/WsaTestPortType.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/WsaTestPortType.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/WsaTestPortType.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189.anon; + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.Action; + +/** + * This class was generated by Apache CXF 2.6.0-SNAPSHOT + * 2012-09-04T14:44:06.248+08:00 + * Generated source version: 2.6.0-SNAPSHOT + * + */ +@WebService(targetNamespace = "http://example.org", name = "wsaTestPortType") +(a)XmlSeeAlso({ObjectFactory.class}) +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface WsaTestPortType { + + @Oneway + @Action(input = "http://example.org/action/notify") + @WebMethod(operationName = "Notify", action = "http://example.org/action/notify") + public void notify( + @WebParam(partName = "notify", name = "notify", targetNamespace = "http://example.org/notify") + java.lang.String notify + ); + + @WebResult(name = "echoOut", targetNamespace = "http://example.org/echo", partName = "echoOut") + @Action(input = "http://example.org/action/echoIn", output = "http://example.org/action/echoOut") + @WebMethod(operationName = "Echo", action = "http://example.org/action/echoIn") + public java.lang.String echo( + @WebParam(partName = "echoIn", name = "echoIn", targetNamespace = "http://example.org/echo") + java.lang.String echoIn + ); +} Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/WsaTestPortTypeImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/WsaTestPortTypeImpl.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/anon/WsaTestPortTypeImpl.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189.anon; + +(a)javax.jws.WebService( + serviceName = "wsaTestService", + portName = "CustomBinding_wsaTestPortType", + targetNamespace = "http://tempuri.org/", + wsdlLocation = "WEB-INF/wsdl/Test1189-Anon.wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.bp12.wsa.test1189.anon.WsaTestPortType") + +public class WsaTestPortTypeImpl implements WsaTestPortType { + + public void notify(java.lang.String notify) { + System.out.println(notify); + } + + public java.lang.String echo(java.lang.String echoIn) { + return echoIn; + } + +} Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/ObjectFactory.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/ObjectFactory.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/ObjectFactory.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,279 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189.nonanon; + +import java.math.BigDecimal; +import java.math.BigInteger; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.bp12.wsa.test1189.nonanon package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _EchoIn_QNAME = new QName("http://example.org/echo", "echoIn"); + private final static QName _UnsignedShort_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedShort"); + private final static QName _EchoOut_QNAME = new QName("http://example.org/echo", "echoOut"); + private final static QName _Double_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "double"); + private final static QName _Long_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "long"); + private final static QName _Decimal_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "decimal"); + private final static QName _Float_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "float"); + private final static QName _AnyURI_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "anyURI"); + private final static QName _Int_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "int"); + private final static QName _QName_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "QName"); + private final static QName _UnsignedInt_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedInt"); + private final static QName _AnyType_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "anyType"); + private final static QName _Notify_QNAME = new QName("http://example.org/notify", "notify"); + private final static QName _UnsignedByte_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedByte"); + private final static QName _DateTime_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "dateTime"); + private final static QName _Boolean_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "boolean"); + private final static QName _UnsignedLong_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "unsignedLong"); + private final static QName _Base64Binary_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "base64Binary"); + private final static QName _Duration_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "duration"); + private final static QName _Short_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "short"); + private final static QName _String_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "string"); + private final static QName _Byte_QNAME = new QName("http://schemas.example.com/2003/10/Serialization/", "byte"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.bp12.wsa.test1189.nonanon + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoIn") + public JAXBElement<String> createEchoIn(String value) { + return new JAXBElement<String>(_EchoIn_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedShort") + public JAXBElement<Integer> createUnsignedShort(Integer value) { + return new JAXBElement<Integer>(_UnsignedShort_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/echo", name = "echoOut") + public JAXBElement<String> createEchoOut(String value) { + return new JAXBElement<String>(_EchoOut_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Double }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "double") + public JAXBElement<Double> createDouble(Double value) { + return new JAXBElement<Double>(_Double_QNAME, Double.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "long") + public JAXBElement<Long> createLong(Long value) { + return new JAXBElement<Long>(_Long_QNAME, Long.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigDecimal }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "decimal") + public JAXBElement<BigDecimal> createDecimal(BigDecimal value) { + return new JAXBElement<BigDecimal>(_Decimal_QNAME, BigDecimal.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "float") + public JAXBElement<Float> createFloat(Float value) { + return new JAXBElement<Float>(_Float_QNAME, Float.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "anyURI") + public JAXBElement<String> createAnyURI(String value) { + return new JAXBElement<String>(_AnyURI_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "int") + public JAXBElement<Integer> createInt(Integer value) { + return new JAXBElement<Integer>(_Int_QNAME, Integer.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link QName }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "QName") + public JAXBElement<QName> createQName(QName value) { + return new JAXBElement<QName>(_QName_QNAME, QName.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedInt") + public JAXBElement<Long> createUnsignedInt(Long value) { + return new JAXBElement<Long>(_UnsignedInt_QNAME, Long.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "anyType") + public JAXBElement<Object> createAnyType(Object value) { + return new JAXBElement<Object>(_AnyType_QNAME, Object.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://example.org/notify", name = "notify") + public JAXBElement<String> createNotify(String value) { + return new JAXBElement<String>(_Notify_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedByte") + public JAXBElement<Short> createUnsignedByte(Short value) { + return new JAXBElement<Short>(_UnsignedByte_QNAME, Short.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "dateTime") + public JAXBElement<XMLGregorianCalendar> createDateTime(XMLGregorianCalendar value) { + return new JAXBElement<XMLGregorianCalendar>(_DateTime_QNAME, XMLGregorianCalendar.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "boolean") + public JAXBElement<Boolean> createBoolean(Boolean value) { + return new JAXBElement<Boolean>(_Boolean_QNAME, Boolean.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "unsignedLong") + public JAXBElement<BigInteger> createUnsignedLong(BigInteger value) { + return new JAXBElement<BigInteger>(_UnsignedLong_QNAME, BigInteger.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "base64Binary") + public JAXBElement<byte[]> createBase64Binary(byte[] value) { + return new JAXBElement<byte[]>(_Base64Binary_QNAME, byte[].class, null, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Duration }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "duration") + public JAXBElement<Duration> createDuration(Duration value) { + return new JAXBElement<Duration>(_Duration_QNAME, Duration.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Short }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "short") + public JAXBElement<Short> createShort(Short value) { + return new JAXBElement<Short>(_Short_QNAME, Short.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "string") + public JAXBElement<String> createString(String value) { + return new JAXBElement<String>(_String_QNAME, String.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Byte }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://schemas.example.com/2003/10/Serialization/", name = "byte") + public JAXBElement<Byte> createByte(Byte value) { + return new JAXBElement<Byte>(_Byte_QNAME, Byte.class, null, value); + } + +} Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/Test1189NonAnonTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/Test1189NonAnonTestCase.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/Test1189NonAnonTestCase.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189.nonanon; + +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.jboss.wsf.test.JBossWSCXFTestSetup; +import org.jboss.wsf.test.JBossWSTest; + +public class Test1189NonAnonTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-bp12test1189-nonanon/Test1189NonAnon"; + + public static Test suite() + { + return new JBossWSCXFTestSetup(Test1189NonAnonTestCase.class, "jaxws-bp12test1189-nonanon.war"); + } + + public void testWSA() throws Exception + { + // construct proxy + QName serviceName = new QName("http://tempuri.org/", "wsaTestService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + WsaTestPortType port = (WsaTestPortType) service.getPort(WsaTestPortType.class); + // invoke method + ((BindingProvider) port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + "http://" + getServerHost() + "/jaxws-bp12test1189-nonanon/Test1189NonAnon"); + + try + { + port.echo("input string"); + fail("only non anonymous supported fault is expected"); + } + catch (SOAPFaultException e) + { + assertTrue("non-anonymous required message is expected", e.getMessage().contains("Found anonymous address but non-anonymous required")); + } + + + } +} \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/WsaTestPortType.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/WsaTestPortType.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/WsaTestPortType.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189.nonanon; + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.Action; + +@WebService(targetNamespace = "http://example.org", name = "wsaTestPortType") +(a)XmlSeeAlso({ObjectFactory.class}) +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface WsaTestPortType { + + @Oneway + @Action(input = "http://example.org/action/notify") + @WebMethod(operationName = "Notify", action = "http://example.org/action/notify") + public void notify( + @WebParam(partName = "notify", name = "notify", targetNamespace = "http://example.org/notify") + java.lang.String notify + ); + + @WebResult(name = "echoOut", targetNamespace = "http://example.org/echo", partName = "echoOut") + @Action(input = "http://example.org/action/echoIn", output = "http://example.org/action/echoOut") + @WebMethod(operationName = "Echo", action = "http://example.org/action/echoIn") + public java.lang.String echo( + @WebParam(partName = "echoIn", name = "echoIn", targetNamespace = "http://example.org/echo") + java.lang.String echoIn + ); +} Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/WsaTestPortTypeImpl.java =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/WsaTestPortTypeImpl.java (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1189/nonanon/WsaTestPortTypeImpl.java 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.bp12.wsa.test1189.nonanon; + + + +(a)javax.jws.WebService( + serviceName = "wsaTestService", + portName = "CustomBinding_wsaTestPortType", + targetNamespace = "http://tempuri.org/", + wsdlLocation = "WEB-INF/wsdl/Test1189-NonAnon.wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.bp12.wsa.test1189.nonanon.WsaTestPortType") + +public class WsaTestPortTypeImpl implements WsaTestPortType { + + public void notify(java.lang.String notify) { + System.out.println(notify); + } + + public java.lang.String echo(java.lang.String echoIn) { + return echoIn; + } + + +} Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/complexrpc/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/complexrpc/WEB-INF/web.xml 2012-09-04 16:28:07 UTC (rev 16695) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/complexrpc/WEB-INF/web.xml 2012-09-05 09:27:00 UTC (rev 16696) @@ -3,10 +3,10 @@ <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/j2ee/web-app_2_5.xsd"> - + <servlet> <servlet-name>ComplexRPC</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.bp12.complexrpc.IComplexDataTypesRpcLitImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.bp12.complexrpc.WsaTestPortTypeImpl</servlet-class> </servlet> @@ -14,4 +14,5 @@ <servlet-name>ComplexRPC</servlet-name> <url-pattern>/ComplexRPC</url-pattern> </servlet-mapping> + </web-app> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/web.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/web.xml 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,16 @@ +<?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/j2ee/web-app_2_5.xsd"> + <servlet> + <servlet-name>Test1189</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.bp12.wsa.test1189.WsaTestPortTypeImpl</servlet-class> + </servlet> + + + <servlet-mapping> + <servlet-name>Test1189</servlet-name> + <url-pattern>/Test1189</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions name="wsaTestService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://tempuri.org/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:i0="http://example.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsp:Policy wsu:Id="CustomBinding_wsaTestPortType_policy"> + <wsp:ExactlyOne> + <wsp:All> + <wsam:Addressing> + <wsp:Policy /> + </wsam:Addressing> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsdl:import namespace="http://example.org" location="Addressing0.wsdl"/> + <wsdl:types/> + <wsdl:binding name="CustomBinding_wsaTestPortType" type="i0:wsaTestPortType"> + <wsp:PolicyReference URI="#CustomBinding_wsaTestPortType_policy" /> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="Echo"> + <soap:operation soapAction="http://example.org/action/echoIn" style="document" /> + <wsdl:input name="EchoInMessage"> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output name="EchoOutMessage"> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Notify"> + <soap:operation soapAction="http://example.org/action/notify" style="document" /> + <wsdl:input name="NotifyMessage"> + <soap:body use="literal" /> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="wsaTestService"> + <wsdl:port name="CustomBinding_wsaTestPortType" binding="tns:CustomBinding_wsaTestPortType"> + <soap:address location="http://localhost/WSAddressing/Soap11"/> + <wsa10:EndpointReference> + <wsa10:Address>http://localhost/WSAddressing/Soap11</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing0.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing0.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing0.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions targetNamespace="http://example.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://example.org" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsdl:types> + <xsd:schema targetNamespace="http://example.org/Imports"> + <xsd:import schemaLocation="Addressing0.xsd" namespace="http://example.org/echo" /> + <xsd:import schemaLocation="Addressing1.xsd" namespace="http://example.org/notify" /> + <xsd:import schemaLocation="SignatureDocLit0.xsd" namespace="http://schemas.example.com/2003/10/Serialization/" /> + </xsd:schema> + </wsdl:types> + <wsdl:message name="EchoInMessage"> + <wsdl:part name="echoIn" element="q1:echoIn" xmlns:q1="http://example.org/echo" /> + </wsdl:message> + <wsdl:message name="EchoOutMessage"> + <wsdl:part name="echoOut" element="q1:echoOut" xmlns:q1="http://example.org/echo" /> + </wsdl:message> + <wsdl:message name="NotifyMessage"> + <wsdl:part name="notify" element="q2:notify" xmlns:q2="http://example.org/notify"/> + </wsdl:message> + <wsdl:portType name="wsaTestPortType"> + <wsdl:operation name="Echo"> + <wsdl:input wsam:Action="http://example.org/action/echoIn" name="EchoInMessage" message="tns:EchoInMessage" /> + <wsdl:output wsam:Action="http://example.org/action/echoOut" name="EchoOutMessage" message="tns:EchoOutMessage" /> + </wsdl:operation> + <wsdl:operation name="Notify"> + <wsdl:input wsam:Action="http://example.org/action/notify" name="NotifyMessage" message="tns:NotifyMessage" /> + </wsdl:operation> + </wsdl:portType> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing0.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing0.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing0.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" ?> +<xs:schema elementFormDefault="qualified" targetNamespace="http://example.org/echo" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.org/echo"> + <xs:element name="echoIn" nillable="true" type="xs:string" /> + <xs:element name="echoOut" nillable="true" type="xs:string" /> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing1.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing1.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Addressing1.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" ?> +<xs:schema elementFormDefault="qualified" targetNamespace="http://example.org/notify" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.org/notify"> + <xs:element name="notify" nillable="true" type="xs:string" /> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/SignatureDocLit0.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/SignatureDocLit0.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/SignatureDocLit0.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://schemas.example.com/2003/10/Serialization/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.example.com/2003/10/Serialization/"> + <xs:element name="anyType" nillable="true" type="xs:anyType"/> + <xs:element name="anyURI" nillable="true" type="xs:anyURI"/> + <xs:element name="base64Binary" nillable="true" type="xs:base64Binary"/> + <xs:element name="boolean" nillable="true" type="xs:boolean"/> + <xs:element name="byte" nillable="true" type="xs:byte"/> + <xs:element name="dateTime" nillable="true" type="xs:dateTime"/> + <xs:element name="decimal" nillable="true" type="xs:decimal"/> + <xs:element name="double" nillable="true" type="xs:double"/> + <xs:element name="float" nillable="true" type="xs:float"/> + <xs:element name="int" nillable="true" type="xs:int"/> + <xs:element name="long" nillable="true" type="xs:long"/> + <xs:element name="QName" nillable="true" type="xs:QName"/> + <xs:element name="short" nillable="true" type="xs:short"/> + <xs:element name="string" nillable="true" type="xs:string"/> + <xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte"/> + <xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt"/> + <xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong"/> + <xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort"/> + <xs:element name="duration" nillable="true" type="xs:duration"/> + <xs:attribute name="FactoryType" type="xs:QName"/> + <xs:attribute name="Id" type="xs:ID"/> + <xs:attribute name="Ref" type="xs:IDREF"/> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Test1189.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Test1189.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189/WEB-INF/wsdl/Test1189.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions name="wsaTestService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://tempuri.org/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:i0="http://example.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsp:Policy wsu:Id="CustomBinding_wsaTestPortType_policy"> + <wsp:ExactlyOne> + <wsp:All> + <wsam:Addressing> + <wsp:Policy /> + </wsam:Addressing> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsdl:import namespace="http://example.org" location="Addressing0.wsdl"/> + <wsdl:types/> + <wsdl:binding name="CustomBinding_wsaTestPortType" type="i0:wsaTestPortType"> + <wsp:PolicyReference URI="#CustomBinding_wsaTestPortType_policy" /> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="Echo"> + <soap:operation soapAction="http://example.org/action/echoIn" style="document" /> + <wsdl:input name="EchoInMessage"> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output name="EchoOutMessage"> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Notify"> + <soap:operation soapAction="http://example.org/action/notify" style="document" /> + <wsdl:input name="NotifyMessage"> + <soap:body use="literal" /> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="wsaTestService"> + <wsdl:port name="CustomBinding_wsaTestPortType" binding="tns:CustomBinding_wsaTestPortType"> + <soap:address location="http://localhost/WSAddressing/Soap11"/> + <wsa10:EndpointReference> + <wsa10:Address>http://localhost/WSAddressing/Soap11</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/web.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/web.xml 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,16 @@ +<?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/j2ee/web-app_2_5.xsd"> + <servlet> + <servlet-name>Test1189Anon</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.bp12.wsa.test1189.anon.WsaTestPortTypeImpl</servlet-class> + </servlet> + + + <servlet-mapping> + <servlet-name>Test1189Anon</servlet-name> + <url-pattern>/Test1189Anon</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions name="wsaTestService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://tempuri.org/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:i0="http://example.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsp:Policy wsu:Id="CustomBinding_wsaTestPortType_policy"> + <wsp:ExactlyOne> + <wsp:All> + <wsam:Addressing> + <wsp:Policy /> + </wsam:Addressing> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsdl:import namespace="http://example.org" location="Addressing0.wsdl"/> + <wsdl:types/> + <wsdl:binding name="CustomBinding_wsaTestPortType" type="i0:wsaTestPortType"> + <wsp:PolicyReference URI="#CustomBinding_wsaTestPortType_policy" /> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="Echo"> + <soap:operation soapAction="http://example.org/action/echoIn" style="document" /> + <wsdl:input name="EchoInMessage"> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output name="EchoOutMessage"> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Notify"> + <soap:operation soapAction="http://example.org/action/notify" style="document" /> + <wsdl:input name="NotifyMessage"> + <soap:body use="literal" /> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="wsaTestService"> + <wsdl:port name="CustomBinding_wsaTestPortType" binding="tns:CustomBinding_wsaTestPortType"> + <soap:address location="http://localhost/WSAddressing/Soap11"/> + <wsa10:EndpointReference> + <wsa10:Address>http://localhost/WSAddressing/Soap11</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing0.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing0.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing0.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions targetNamespace="http://example.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://example.org" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsdl:types> + <xsd:schema targetNamespace="http://example.org/Imports"> + <xsd:import schemaLocation="Addressing0.xsd" namespace="http://example.org/echo" /> + <xsd:import schemaLocation="Addressing1.xsd" namespace="http://example.org/notify" /> + <xsd:import schemaLocation="SignatureDocLit0.xsd" namespace="http://schemas.example.com/2003/10/Serialization/" /> + </xsd:schema> + </wsdl:types> + <wsdl:message name="EchoInMessage"> + <wsdl:part name="echoIn" element="q1:echoIn" xmlns:q1="http://example.org/echo" /> + </wsdl:message> + <wsdl:message name="EchoOutMessage"> + <wsdl:part name="echoOut" element="q1:echoOut" xmlns:q1="http://example.org/echo" /> + </wsdl:message> + <wsdl:message name="NotifyMessage"> + <wsdl:part name="notify" element="q2:notify" xmlns:q2="http://example.org/notify"/> + </wsdl:message> + <wsdl:portType name="wsaTestPortType"> + <wsdl:operation name="Echo"> + <wsdl:input wsam:Action="http://example.org/action/echoIn" name="EchoInMessage" message="tns:EchoInMessage" /> + <wsdl:output wsam:Action="http://example.org/action/echoOut" name="EchoOutMessage" message="tns:EchoOutMessage" /> + </wsdl:operation> + <wsdl:operation name="Notify"> + <wsdl:input wsam:Action="http://example.org/action/notify" name="NotifyMessage" message="tns:NotifyMessage" /> + </wsdl:operation> + </wsdl:portType> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing0.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing0.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing0.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" ?> +<xs:schema elementFormDefault="qualified" targetNamespace="http://example.org/echo" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.org/echo"> + <xs:element name="echoIn" nillable="true" type="xs:string" /> + <xs:element name="echoOut" nillable="true" type="xs:string" /> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing1.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing1.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Addressing1.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" ?> +<xs:schema elementFormDefault="qualified" targetNamespace="http://example.org/notify" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.org/notify"> + <xs:element name="notify" nillable="true" type="xs:string" /> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/SignatureDocLit0.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/SignatureDocLit0.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/SignatureDocLit0.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://schemas.example.com/2003/10/Serialization/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.example.com/2003/10/Serialization/"> + <xs:element name="anyType" nillable="true" type="xs:anyType"/> + <xs:element name="anyURI" nillable="true" type="xs:anyURI"/> + <xs:element name="base64Binary" nillable="true" type="xs:base64Binary"/> + <xs:element name="boolean" nillable="true" type="xs:boolean"/> + <xs:element name="byte" nillable="true" type="xs:byte"/> + <xs:element name="dateTime" nillable="true" type="xs:dateTime"/> + <xs:element name="decimal" nillable="true" type="xs:decimal"/> + <xs:element name="double" nillable="true" type="xs:double"/> + <xs:element name="float" nillable="true" type="xs:float"/> + <xs:element name="int" nillable="true" type="xs:int"/> + <xs:element name="long" nillable="true" type="xs:long"/> + <xs:element name="QName" nillable="true" type="xs:QName"/> + <xs:element name="short" nillable="true" type="xs:short"/> + <xs:element name="string" nillable="true" type="xs:string"/> + <xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte"/> + <xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt"/> + <xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong"/> + <xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort"/> + <xs:element name="duration" nillable="true" type="xs:duration"/> + <xs:attribute name="FactoryType" type="xs:QName"/> + <xs:attribute name="Id" type="xs:ID"/> + <xs:attribute name="Ref" type="xs:IDREF"/> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Test1189-Anon.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Test1189-Anon.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-anon/WEB-INF/wsdl/Test1189-Anon.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions name="wsaTestService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://tempuri.org/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:i0="http://example.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsp:Policy wsu:Id="CustomBinding_wsaTestPortType_policy"> + <wsp:ExactlyOne> + <wsp:All> + <wsam:Addressing> + <wsp:Policy> + <wsam:AnonymousResponses/> + </wsp:Policy> + </wsam:Addressing> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsdl:import namespace="http://example.org" location="Addressing0.wsdl"/> + <wsdl:types/> + <wsdl:binding name="CustomBinding_wsaTestPortType" type="i0:wsaTestPortType"> + <wsp:PolicyReference URI="#CustomBinding_wsaTestPortType_policy" /> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="Echo"> + <soap:operation soapAction="http://example.org/action/echoIn" style="document" /> + <wsdl:input name="EchoInMessage"> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output name="EchoOutMessage"> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Notify"> + <soap:operation soapAction="http://example.org/action/notify" style="document" /> + <wsdl:input name="NotifyMessage"> + <soap:body use="literal" /> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="wsaTestService"> + <wsdl:port name="CustomBinding_wsaTestPortType" binding="tns:CustomBinding_wsaTestPortType"> + <soap:address location="http://localhost/WSAddressing/Soap11"/> + <wsa10:EndpointReference> + <wsa10:Address>http://localhost/WSAddressing/Soap11</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/web.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/web.xml 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,16 @@ +<?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/j2ee/web-app_2_5.xsd"> + <servlet> + <servlet-name>Test1189NonAnon</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.bp12.wsa.test1189.nonanon.WsaTestPortTypeImpl</servlet-class> + </servlet> + + + <servlet-mapping> + <servlet-name>Test1189NonAnon</servlet-name> + <url-pattern>/Test1189NonAnon</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions name="wsaTestService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://tempuri.org/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:i0="http://example.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsp:Policy wsu:Id="CustomBinding_wsaTestPortType_policy"> + <wsp:ExactlyOne> + <wsp:All> + <wsam:Addressing> + <wsp:Policy /> + </wsam:Addressing> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsdl:import namespace="http://example.org" location="Addressing0.wsdl"/> + <wsdl:types/> + <wsdl:binding name="CustomBinding_wsaTestPortType" type="i0:wsaTestPortType"> + <wsp:PolicyReference URI="#CustomBinding_wsaTestPortType_policy" /> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="Echo"> + <soap:operation soapAction="http://example.org/action/echoIn" style="document" /> + <wsdl:input name="EchoInMessage"> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output name="EchoOutMessage"> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Notify"> + <soap:operation soapAction="http://example.org/action/notify" style="document" /> + <wsdl:input name="NotifyMessage"> + <soap:body use="literal" /> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="wsaTestService"> + <wsdl:port name="CustomBinding_wsaTestPortType" binding="tns:CustomBinding_wsaTestPortType"> + <soap:address location="http://localhost/WSAddressing/Soap11"/> + <wsa10:EndpointReference> + <wsa10:Address>http://localhost/WSAddressing/Soap11</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing0.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing0.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing0.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions targetNamespace="http://example.org" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://example.org" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsdl:types> + <xsd:schema targetNamespace="http://example.org/Imports"> + <xsd:import schemaLocation="Addressing0.xsd" namespace="http://example.org/echo" /> + <xsd:import schemaLocation="Addressing1.xsd" namespace="http://example.org/notify" /> + <xsd:import schemaLocation="SignatureDocLit0.xsd" namespace="http://schemas.example.com/2003/10/Serialization/" /> + </xsd:schema> + </wsdl:types> + <wsdl:message name="EchoInMessage"> + <wsdl:part name="echoIn" element="q1:echoIn" xmlns:q1="http://example.org/echo" /> + </wsdl:message> + <wsdl:message name="EchoOutMessage"> + <wsdl:part name="echoOut" element="q1:echoOut" xmlns:q1="http://example.org/echo" /> + </wsdl:message> + <wsdl:message name="NotifyMessage"> + <wsdl:part name="notify" element="q2:notify" xmlns:q2="http://example.org/notify"/> + </wsdl:message> + <wsdl:portType name="wsaTestPortType"> + <wsdl:operation name="Echo"> + <wsdl:input wsam:Action="http://example.org/action/echoIn" name="EchoInMessage" message="tns:EchoInMessage" /> + <wsdl:output wsam:Action="http://example.org/action/echoOut" name="EchoOutMessage" message="tns:EchoOutMessage" /> + </wsdl:operation> + <wsdl:operation name="Notify"> + <wsdl:input wsam:Action="http://example.org/action/notify" name="NotifyMessage" message="tns:NotifyMessage" /> + </wsdl:operation> + </wsdl:portType> +</wsdl:definitions> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing0.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing0.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing0.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" ?> +<xs:schema elementFormDefault="qualified" targetNamespace="http://example.org/echo" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.org/echo"> + <xs:element name="echoIn" nillable="true" type="xs:string" /> + <xs:element name="echoOut" nillable="true" type="xs:string" /> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing1.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing1.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Addressing1.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" ?> +<xs:schema elementFormDefault="qualified" targetNamespace="http://example.org/notify" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://example.org/notify"> + <xs:element name="notify" nillable="true" type="xs:string" /> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/SignatureDocLit0.xsd =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/SignatureDocLit0.xsd (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/SignatureDocLit0.xsd 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://schemas.example.com/2003/10/Serialization/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.example.com/2003/10/Serialization/"> + <xs:element name="anyType" nillable="true" type="xs:anyType"/> + <xs:element name="anyURI" nillable="true" type="xs:anyURI"/> + <xs:element name="base64Binary" nillable="true" type="xs:base64Binary"/> + <xs:element name="boolean" nillable="true" type="xs:boolean"/> + <xs:element name="byte" nillable="true" type="xs:byte"/> + <xs:element name="dateTime" nillable="true" type="xs:dateTime"/> + <xs:element name="decimal" nillable="true" type="xs:decimal"/> + <xs:element name="double" nillable="true" type="xs:double"/> + <xs:element name="float" nillable="true" type="xs:float"/> + <xs:element name="int" nillable="true" type="xs:int"/> + <xs:element name="long" nillable="true" type="xs:long"/> + <xs:element name="QName" nillable="true" type="xs:QName"/> + <xs:element name="short" nillable="true" type="xs:short"/> + <xs:element name="string" nillable="true" type="xs:string"/> + <xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte"/> + <xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt"/> + <xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong"/> + <xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort"/> + <xs:element name="duration" nillable="true" type="xs:duration"/> + <xs:attribute name="FactoryType" type="xs:QName"/> + <xs:attribute name="Id" type="xs:ID"/> + <xs:attribute name="Ref" type="xs:IDREF"/> +</xs:schema> \ No newline at end of file Added: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Test1189-NonAnon.wsdl =================================================================== --- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Test1189-NonAnon.wsdl (rev 0) +++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/resources/jaxws/bp12/wsa/test1189-nonanon/WEB-INF/wsdl/Test1189-NonAnon.wsdl 2012-09-05 09:27:00 UTC (rev 16696) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions name="wsaTestService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:tns="http://tempuri.org/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:i0="http://example.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa10="http://www.w3.org/2005/08/addressing"> + <wsp:Policy wsu:Id="CustomBinding_wsaTestPortType_policy"> + <wsp:ExactlyOne> + <wsp:All> + <wsam:Addressing> + <wsp:Policy> + <wsam:NonAnonymousResponses/> + </wsp:Policy> + </wsam:Addressing> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsdl:import namespace="http://example.org" location="Addressing0.wsdl"/> + <wsdl:types/> + <wsdl:binding name="CustomBinding_wsaTestPortType" type="i0:wsaTestPortType"> + <wsp:PolicyReference URI="#CustomBinding_wsaTestPortType_policy" /> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="Echo"> + <soap:operation soapAction="http://example.org/action/echoIn" style="document" /> + <wsdl:input name="EchoInMessage"> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output name="EchoOutMessage"> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="Notify"> + <soap:operation soapAction="http://example.org/action/notify" style="document" /> + <wsdl:input name="NotifyMessage"> + <soap:body use="literal" /> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="wsaTestService"> + <wsdl:port name="CustomBinding_wsaTestPortType" binding="tns:CustomBinding_wsaTestPortType"> + <soap:address location="http://localhost/WSAddressing/Soap11"/> + <wsa10:EndpointReference> + <wsa10:Address>http://localhost/WSAddressing/Soap11</wsa10:Address> + </wsa10:EndpointReference> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file

12 years, 4 months

1
0
0 / 0

JBossWS SVN: r16695 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-09-04 12:28:07 -0400 (Tue, 04 Sep 2012) New Revision: 16695 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/jaxws-client-config.xml Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java Log: [JBWS-3500] Yet another test, but using client configuration Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-04 15:42:53 UTC (rev 16694) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-04 16:28:07 UTC (rev 16695) @@ -91,6 +91,11 @@ <include name="validatingClient.wsdl" /> </zipfileset> </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF"> + <include name="jaxws-client-config.xml" /> + </metainf> + </jar>  <war Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java 2012-09-04 15:42:53 UTC (rev 16694) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/SchemaValidationTestCase.java 2012-09-04 16:28:07 UTC (rev 16695) @@ -30,6 +30,7 @@ import junit.framework.Test; import org.jboss.test.ws.jaxws.samples.schemavalidation.types.HelloResponse; +import org.jboss.ws.api.configuration.ClientConfigUtil; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -46,7 +47,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(SchemaValidationTestCase.class, "jaxws-samples-schemavalidation.war"); + return new JBossWSCXFTestSetup(SchemaValidationTestCase.class, "jaxws-samples-schemavalidation.war,jaxws-samples-schemavalidation-client.jar"); } public void testSchemaValidationEndpoint() throws Exception @@ -100,4 +101,23 @@ assertTrue("not respect to enumration error is expected", e.getMessage().contains("is not facet-valid with respect to enumeration")); } } + + public void testClientSideSchemaValidationUsingConfiguration() throws Exception + { + QName serviceName = new QName("http://jboss.org/schemavalidation", "HelloService"); + URL wsdlURL = getResourceURL("jaxws/samples/schemavalidation/validatingClient.wsdl"); + Service service = Service.create(wsdlURL, serviceName); + Hello proxy = (Hello)service.getPort(new QName("http://jboss.org/schemavalidation", "HelloPort"), Hello.class); + ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL); + ClientConfigUtil.setConfigProperties(proxy, "META-INF/jaxws-client-config.xml", "Test Validating Client Config"); //enable client side schema validation + HelloResponse hr = proxy.helloRequest("JBoss"); + assertNotNull(hr); + assertEquals(2, hr.getReturn()); + try { + proxy.helloRequest("number"); + fail("validation error is expected"); + } catch (Exception e) { + assertTrue("not respect to enumration error is expected", e.getMessage().contains("is not facet-valid with respect to enumeration")); + } + } } \ No newline at end of file Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/jaxws-client-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/jaxws-client-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/jaxws-client-config.xml 2012-09-04 16:28:07 UTC (rev 16695) @@ -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"> + + <client-config> + <config-name>Test Validating Client Config</config-name> + <property> + <property-name>schema-validation-enabled</property-name> + <property-value>true</property-value> + </property> + </client-config> + +</jaxws-config> \ No newline at end of file

12 years, 4 months

1
0
0 / 0

JBossWS SVN: r16694 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-09-04 11:42:53 -0400 (Tue, 04 Sep 2012) New Revision: 16694 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java Log: Minor fix to the test Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java 2012-09-04 15:21:03 UTC (rev 16693) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java 2012-09-04 15:42:53 UTC (rev 16694) @@ -24,7 +24,6 @@ import java.net.URL; import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import org.apache.cxf.frontend.ClientProxy; @@ -48,7 +47,7 @@ Service service = Service.create(new URL(address + "?wsdl"), serviceName); Endpoint port = (Endpoint)service.getPort(Endpoint.class); - ClientConfigUtil.setConfigProperties((BindingProvider)port, "META-INF/jaxws-client-config.xml", "Custom Client Config"); + ClientConfigUtil.setConfigProperties(port, "META-INF/jaxws-client-config.xml", "Custom Client Config"); return ClientProxy.getClient(port).getEndpoint().get("propA").equals("fileValueA"); } @@ -61,10 +60,9 @@ assert(ep.get("propA") == null); assert(ep.get("propB") == null); ep.put("propZ", "valueZ"); - BindingProvider bp = (BindingProvider)port; ClientConfigurer configurer = ClientConfigUtil.resolveClientConfigurer(); - configurer.setConfigProperties(bp, "META-INF/jaxws-client-config.xml", "Custom Client Config"); + configurer.setConfigProperties(port, "META-INF/jaxws-client-config.xml", "Custom Client Config"); if (!ep.get("propA").equals("fileValueA") || !ep.get("propB").equals("fileValueB") || !ep.get("propZ").equals("valueZ")) { return false; @@ -72,7 +70,7 @@ port.echo("Kermit"); - configurer.setConfigProperties(bp, "META-INF/jaxws-client-config.xml", "Another Client Config"); + configurer.setConfigProperties(port, "META-INF/jaxws-client-config.xml", "Another Client Config"); return (ep.get("propA") == null && ep.get("propB") == null && ep.get("propC").equals("fileValueC") && ep.get("propZ").equals("valueZ")); } @@ -129,7 +127,7 @@ org.apache.cxf.endpoint.Endpoint ep = ClientProxy.getClient(port).getEndpoint(); ep.put("propZ", "valueZ"); - ClientConfigUtil.setConfigProperties((BindingProvider)port, null, testConfigName); + ClientConfigUtil.setConfigProperties(port, null, testConfigName); return (ep.get("propT").equals("valueT") && ep.get("propZ").equals("valueZ")); }

12 years, 4 months

1
0
0 / 0

JBossWS SVN: r16693 - in stack/cxf/trunk/modules: testsuite/cxf-tests/scripts and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-09-04 11:21:03 -0400 (Tue, 04 Sep 2012) New Revision: 16693 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Endpoint.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/EndpointImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/jaxws-client-config.xml Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: [JBWS-3529] Adding more tests + removing props from former configuration when setting up those of a new one Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java 2012-09-03 15:43:54 UTC (rev 16692) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java 2012-09-04 15:21:03 UTC (rev 16693) @@ -22,8 +22,10 @@ package org.jboss.wsf.stack.cxf.client.configuration; import java.util.Map; +import java.util.Set; import org.apache.cxf.endpoint.Client; +import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.frontend.ClientProxy; import org.jboss.ws.common.configuration.ConfigHelper; import org.jboss.wsf.spi.metadata.config.ClientConfig; @@ -37,13 +39,37 @@ */ public class CXFClientConfigurer extends ConfigHelper { + private static final String JBOSSWS_CXF_CLIENT_CONF_PROPS = "jbossws.cxf.client.conf.props"; + @Override public void setConfigProperties(Object proxy, String configFile, String configName) { ClientConfig config = readConfig(configFile, configName); - setConfigProperties(ClientProxy.getClient(proxy), config.getProperties()); + Client client = ClientProxy.getClient(proxy); + cleanupPreviousProps(client); + Map<String, String> props = config.getProperties(); + if (props != null && !props.isEmpty()) { + savePropList(client, props); + } + setConfigProperties(client, props); } public void setConfigProperties(Client client, Map<String, String> properties) { client.getEndpoint().putAll(properties); } + + private void savePropList(Client client, Map<String, String> props) { + final Set<String> keys = props.keySet(); + client.getEndpoint().put(JBOSSWS_CXF_CLIENT_CONF_PROPS, (String[])keys.toArray(new String[keys.size()])); + } + + private void cleanupPreviousProps(Client client) { + Endpoint ep = client.getEndpoint(); + String[] previousProps = (String[])ep.get(JBOSSWS_CXF_CLIENT_CONF_PROPS); + if (previousProps != null) { + for (String p : previousProps) { + ep.remove(p); + } + ep.remove(JBOSSWS_CXF_CLIENT_CONF_PROPS); + } + } } 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 2012-09-03 15:43:54 UTC (rev 16692) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-09-04 15:21:03 UTC (rev 16693) @@ -84,6 +84,37 @@ prefix="WEB-INF/wsdl"/> </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-clientConfig.war" needxmlfile="false"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/clientConfig/Endpoint*.class" /> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-clientConfig-inContainer-client.war" needxmlfile="false"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/clientConfig/Endpoint.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.class" /> + <include name="org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.class" /> + <include name="org/jboss/wsf/test/TestServlet.class"/> + <include name="org/jboss/wsf/test/ClientHelper.class"/> + </classes> + <classes dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig"> + <include name="META-INF/jaxws-client-config.xml"/> + </classes> + <manifest> + <attribute name="Dependencies" value="org.apache.cxf.impl"/>  + </manifest> + </war> + +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-clientConfig-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig/META-INF"> + <include name="jaxws-client-config.xml" /> + </metainf> + </jar> +  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-continuations.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/continuations/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFClientConfigurationTestCase.java 2012-09-04 15:21:03 UTC (rev 16693) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.clientConfig; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Verifies client configuration setup + * + * @author alessio.soldano(a)jboss.com + * @since 31-May-2012 + */ +public class CXFClientConfigurationTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(CXFClientConfigurationTestCase.class, "jaxws-cxf-clientConfig.war,jaxws-cxf-clientConfig-client.jar,jaxws-cxf-clientConfig-inContainer-client.war"); + } + + /** + * Verifies a custom client configuration can be read from conf file and set + * + * @throws Exception + */ + public void testCustomClientConfigurationFromFile() throws Exception { + assertTrue(getHelper().testCustomClientConfigurationFromFile()); + } + + public void testCustomClientConfigurationFromFileInContainer() throws Exception { + assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFile")); + } + + /** + * Verifies a client configuration can be changed after another one has been set + * + * @throws Exception + */ + public void testConfigurationChange() throws Exception { + assertTrue(getHelper().testConfigurationChange()); + } + + public void testConfigurationChangeInContainer() throws Exception { + assertEquals("1", runTestInContainer("testConfigurationChange")); + } + + /** + * Verifies the default client configuration from AS model is used + * + * @throws Exception + */ + public void testDefaultClientConfigurationInContainer() throws Exception { + if (!isTargetJBoss71()) { + assertEquals("1", runTestInContainer("testDefaultClientConfiguration")); + } + } + + /** + * Verifies a client configuration from AS model can be set + * + * @throws Exception + */ + public void testCustomClientConfigurationInContainer() throws Exception { + assertEquals("1", runTestInContainer("testCustomClientConfiguration")); + } + + // ------------------------- + + private Helper getHelper() { + Helper helper = new Helper(); + helper.setTargetEndpoint("http://" + getServerHost() + ":8080/jaxws-cxf-clientConfig/EndpointImpl"); + return helper; + } + + private String runTestInContainer(String test) throws Exception + { + URL url = new URL("http://" + getServerHost() + + ":8080/jaxws-cxf-clientConfig-inContainer-client?path=/jaxws-cxf-clientConfig/EndpointImpl&method=" + test + + "&helper=" + Helper.class.getName()); + BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); + return br.readLine(); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Endpoint.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Endpoint.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Endpoint.java 2012-09-04 15:21:03 UTC (rev 16693) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.clientConfig; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name="Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint +{ + public String echo(String input); +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/EndpointImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/EndpointImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/EndpointImpl.java 2012-09-04 15:21:03 UTC (rev 16693) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.clientConfig; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(name="Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info("echo: " + input); + return input; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/Helper.java 2012-09-04 15:21:03 UTC (rev 16693) @@ -0,0 +1,149 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.clientConfig; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import org.apache.cxf.frontend.ClientProxy; +import org.jboss.ws.api.configuration.ClientConfigUtil; +import org.jboss.ws.api.configuration.ClientConfigurer; +import org.jboss.wsf.test.ClientHelper; + +/** + * Verifies client configuration setup + * + * @author alessio.soldano(a)jboss.com + * @since 04-Sep-2012 + */ +public class Helper implements ClientHelper +{ + private final QName serviceName = new QName("http://clientConfig.cxf.jaxws.ws.test.jboss.org/", "EndpointImplService"); + private String address; + + public boolean testCustomClientConfigurationFromFile() throws Exception + { + Service service = Service.create(new URL(address + "?wsdl"), serviceName); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); + + ClientConfigUtil.setConfigProperties((BindingProvider)port, "META-INF/jaxws-client-config.xml", "Custom Client Config"); + + return ClientProxy.getClient(port).getEndpoint().get("propA").equals("fileValueA"); + } + + public boolean testConfigurationChange() throws Exception + { + Service service = Service.create(new URL(address + "?wsdl"), serviceName); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); + org.apache.cxf.endpoint.Endpoint ep = ClientProxy.getClient(port).getEndpoint(); + assert(ep.get("propA") == null); + assert(ep.get("propB") == null); + ep.put("propZ", "valueZ"); + BindingProvider bp = (BindingProvider)port; + + ClientConfigurer configurer = ClientConfigUtil.resolveClientConfigurer(); + configurer.setConfigProperties(bp, "META-INF/jaxws-client-config.xml", "Custom Client Config"); + + if (!ep.get("propA").equals("fileValueA") || !ep.get("propB").equals("fileValueB") || !ep.get("propZ").equals("valueZ")) { + return false; + } + + port.echo("Kermit"); + + configurer.setConfigProperties(bp, "META-INF/jaxws-client-config.xml", "Another Client Config"); + + return (ep.get("propA") == null && ep.get("propB") == null && ep.get("propC").equals("fileValueC") && ep.get("propZ").equals("valueZ")); + } + + /** + * This test hacks the current ServerConfig temporarily adding a property into the AS default client configuration, + * verifies the handler is picked up and finally restores the original default client configuration. + * + * @return + * @throws Exception + */ + public boolean testDefaultClientConfiguration() throws Exception + { + final URL wsdlURL = new URL(address + "?wsdl"); + + // -- modify default conf -- + try + { + TestUtils.getAndVerifyDefaultClientConfiguration().setProperty("propA", "valueA"); + // -- + + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); + + return (ClientProxy.getClient(port).getEndpoint().get("propA").equals("valueA")); + } + finally + { + // -- restore default conf -- + TestUtils.cleanupClientConfig(); + // -- + } + } + + /** + * This test hacks the current ServerConfig temporarily adding a test client configuration, uses that + * for the test client and finally removes it from the ServerConfig. + * + * @return + * @throws Exception + */ + public boolean testCustomClientConfiguration() throws Exception + { + final URL wsdlURL = new URL(address + "?wsdl"); + final String testConfigName = "MyTestConfig"; + try + { + //-- add test client configuration + TestUtils.addTestCaseClientConfiguration(testConfigName); + // -- + + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); + org.apache.cxf.endpoint.Endpoint ep = ClientProxy.getClient(port).getEndpoint(); + ep.put("propZ", "valueZ"); + + ClientConfigUtil.setConfigProperties((BindingProvider)port, null, testConfigName); + + return (ep.get("propT").equals("valueT") && ep.get("propZ").equals("valueZ")); + } + finally + { + // -- remove test client configuration -- + TestUtils.removeTestCaseClientConfiguration(testConfigName); + // -- + } + } + + @Override + public void setTargetEndpoint(String address) + { + this.address = address; + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/TestUtils.java 2012-09-04 15:21:03 UTC (rev 16693) @@ -0,0 +1,102 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.cxf.clientConfig; + +import java.util.Iterator; +import java.util.Map; + +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.classloading.ClassLoaderProvider; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.metadata.config.ClientConfig; + +/** + * Support utils for client config testcase + * + * @author alessio.soldano(a)jboss.com + * @since 04-Sep-2012 + */ +public class TestUtils +{ + public static ClientConfig getAndVerifyDefaultClientConfiguration() throws Exception { + ServerConfig sc = getServerConfig(); + ClientConfig defaultConfig = null; + for (ClientConfig c : sc.getClientConfigs()) { + if (ClientConfig.STANDARD_CLIENT_CONFIG.equals(c.getConfigName())) { + defaultConfig = c; + } + } + if (defaultConfig == null) { + throw new Exception("Missing AS client config '" + ClientConfig.STANDARD_CLIENT_CONFIG + "'!"); + } + Map<String, String> props = defaultConfig.getProperties(); + if (props != null && !props.isEmpty()) { + throw new Exception("'" + ClientConfig.STANDARD_CLIENT_CONFIG + "' property set is not empty!"); + } + return defaultConfig; + } + + public static void cleanupClientConfig() throws Exception { + ServerConfig sc = getServerConfig(); + ClientConfig defaultConfig = null; + for (ClientConfig c : sc.getClientConfigs()) { + if (ClientConfig.STANDARD_CLIENT_CONFIG.equals(c.getConfigName())) { + defaultConfig = c; + } + } + if (defaultConfig == null) { + throw new Exception("Missing AS client config '" + ClientConfig.STANDARD_CLIENT_CONFIG + "'!"); + } + Map<String, String> props = defaultConfig.getProperties(); + if (props == null || props.isEmpty()) { + throw new Exception("'" + ClientConfig.STANDARD_CLIENT_CONFIG + "' property set is already empty!"); + } + props.clear(); + } + + public static void addTestCaseClientConfiguration(String testConfigName) { + ClientConfig config = new ClientConfig(); + config.setConfigName(testConfigName); + config.setProperty("propT", "valueT"); + getServerConfig().addClientConfig(config); + } + + public static void removeTestCaseClientConfiguration(String testConfigName) { + Iterator<ClientConfig> it = getServerConfig().getClientConfigs().iterator(); + while (it.hasNext()) { + ClientConfig c = it.next(); + if (testConfigName.equals(c.getConfigName())) { + it.remove(); + break; + } + } + } + + private static ServerConfig getServerConfig() + { + final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); + SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider(); + return spiProvider.getSPI(ServerConfigFactory.class, cl).getServerConfig(); + } +} Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/jaxws-client-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/jaxws-client-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/jaxws-client-config.xml 2012-09-04 15:21:03 UTC (rev 16693) @@ -0,0 +1,25 @@ +<?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"> + + <client-config> + <config-name>Custom Client Config</config-name> + <property> + <property-name>propA</property-name> + <property-value>fileValueA</property-value> + </property> + <property> + <property-name>propB</property-name> + <property-value>fileValueB</property-value> + </property> + </client-config> + <client-config> + <config-name>Another Client Config</config-name> + <property> + <property-name>propC</property-name> + <property-value>fileValueC</property-value> + </property> + </client-config> + +</jaxws-config> \ No newline at end of file

12 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits September 2012