April 2011 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

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

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r14214 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: metadata and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-30 12:55:22 -0400 (Sat, 30 Apr 2011) New Revision: 14214 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java Log: [JBWS-3282] initial support for @EndpointConfig Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-04-30 16:26:26 UTC (rev 14213) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-04-30 16:55:22 UTC (rev 14214) @@ -146,11 +146,6 @@ } } - protected void registerTransport(DestinationFactory factory, String namespace) - { - bus.getExtension(DestinationFactoryManager.class).registerDestinationFactory(namespace, factory); - } - /** * Return the hold bus * Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-30 16:26:26 UTC (rev 14213) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-30 16:55:22 UTC (rev 14214) @@ -21,8 +21,10 @@ */ package org.jboss.wsf.stack.cxf.configuration; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import javax.xml.ws.handler.Handler; import javax.xml.ws.soap.SOAPBinding; @@ -94,6 +96,12 @@ endpoint.setServiceName(dde.getServiceName()); endpoint.setWsdlLocation(dde.getWsdlLocation()); setHandlers(endpoint, dde.getHandlers()); + if (dde.getProperties() != null) + { + Map<String, Object> props = new HashMap<String, Object>(); + props.putAll(dde.getProperties()); + endpoint.setProperties(props); + } if (dde.isAddressingEnabled()) { WSAddressingFeature addressingFeature = new WSAddressingFeature(); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-04-30 16:26:26 UTC (rev 14213) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-04-30 16:55:22 UTC (rev 14214) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.stack.cxf.metadata; +import java.io.IOException; +import java.io.InputStream; import java.util.LinkedList; import java.util.List; import java.util.Stack; @@ -35,10 +37,14 @@ import org.jboss.logging.Logger; import org.jboss.wsf.common.JavaUtils; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.metadata.config.ConfigMetaDataParser; +import org.jboss.wsf.spi.metadata.config.ConfigRoot; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; @@ -145,26 +151,7 @@ UnifiedHandlerChainsMetaData chainWrapper = portComp.getHandlerChains(); if (chainWrapper != null) { - List<String> handlers = new LinkedList<String>(); - for (UnifiedHandlerChainMetaData handlerChain : chainWrapper.getHandlerChains()) - { - if (handlerChain.getPortNamePattern() != null || handlerChain.getProtocolBindings() != null - || handlerChain.getServiceNamePattern() != null) - { - log.warn("PortNamePattern, ServiceNamePattern and ProtocolBindings filters not supported; adding handlers anyway."); - } - for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) - { - if (log.isDebugEnabled()) - log.debug("Contribute handler from webservices.xml: " + uhmd.getHandlerName()); - if (uhmd.getInitParams() != null && !uhmd.getInitParams().isEmpty()) - { - log.warn("Init params not supported."); - } - handlers.add(uhmd.getHandlerClass()); - } - } - endpoint.setHandlers(handlers); + endpoint.setHandlers(convertEndpointHandlers(chainWrapper.getHandlerChains())); } // MTOM settings @@ -203,6 +190,33 @@ } } + private List<String> convertEndpointHandlers(List<UnifiedHandlerChainMetaData> handlerChains) + { + List<String> handlers = new LinkedList<String>(); + if (handlerChains != null) + { + for (UnifiedHandlerChainMetaData handlerChain : handlerChains) + { + if (handlerChain.getPortNamePattern() != null || handlerChain.getProtocolBindings() != null + || handlerChain.getServiceNamePattern() != null) + { + log.warn("PortNamePattern, ServiceNamePattern and ProtocolBindings filters not supported; adding handlers anyway."); + } + for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) + { + if (log.isDebugEnabled()) + log.debug("Contribute handler from webservices.xml: " + uhmd.getHandlerName()); + if (uhmd.getInitParams() != null && !uhmd.getInitParams().isEmpty()) + { + log.warn("Init params not supported."); + } + handlers.add(uhmd.getHandlerClass()); + } + } + } + return handlers; + } + protected DDEndpoint createDDEndpoint(Class<?> sepClass, ArchiveDeployment dep, Endpoint ep) { WebService anWebService = sepClass.getAnnotation(WebService.class); @@ -226,6 +240,8 @@ String portName = (anWebService != null) ? anWebService.portName() : anWebServiceProvider.portName(); if (portName.length() == 0) portName = name + "Port"; + + EndpointConfig epConfig = sepClass.getAnnotation(EndpointConfig.class); if (anWebService != null && anWebService.endpointInterface().length() > 0) { @@ -250,8 +266,12 @@ if (seiAnnotation.portName().length() > 0 || seiAnnotation.serviceName().length() > 0 || seiAnnotation.endpointInterface().length() > 0) throw new RuntimeException("@WebService cannot have attribute 'portName', 'serviceName', 'endpointInterface' on: " + seiName); + if (epConfig == null) + { + epConfig = seiClass.getAnnotation(EndpointConfig.class); + } } - + DDEndpoint result = new DDEndpoint(); result.setId(ep.getShortName()); @@ -261,15 +281,46 @@ result.setEpClass(seiClass != null ? seiClass : sepClass); result.setPortName(new QName(serviceNS, portName)); result.setServiceName(new QName(serviceNS, serviceName)); + if (epConfig != null) + { + configureEndpoint(dep, result, epConfig.configFile(), epConfig.configName()); + } return result; } + /** + * Configures the endpoint definition according to the specified jaxws configuration + * (provided through @EndpointConfig annotation). The specified config file is looked + * for in the deployment. If it's not found, the specified config is searched in the + * global server endpoint configurations. + * + * @param ep + * @param configFile + * @param configName + */ + private void configureEndpoint(ArchiveDeployment dep, DDEndpoint ep, String configFile, String configName) + { + UnifiedVirtualFile vf = null; + try + { + vf = dep.getRootFile().findChild(configFile); + ConfigRoot config = ConfigMetaDataParser.parse(vf.toURL()); + org.jboss.wsf.spi.metadata.config.EndpointConfig epConfig = config.getEndpointConfigByName(configName); + ep.setPreHandlers(convertEndpointHandlers(epConfig.getPreHandlerChains())); + ep.setPostHandlers(convertEndpointHandlers(epConfig.getPostHandlerChains())); + ep.setProperties(epConfig.getProperties()); + } + catch (IOException e) + { + throw new RuntimeException("Could not find " + configFile); + } + //TODO!! use default endpoint configuration as a fallback + } - /** * Extracts the typeNS given the package name - * Algorithm is based on the one specified in JAWS v2.0 spec + * Algorithm is based on the one specified in JAXWS v2.0 spec */ private static String getTypeNamespace(String packageName) { Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2011-04-30 16:26:26 UTC (rev 14213) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2011-04-30 16:55:22 UTC (rev 14214) @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.Writer; import java.util.List; +import java.util.Map; import javax.xml.namespace.QName; @@ -58,11 +59,19 @@ private boolean respectBindingEnabled; private String wsdlLocation; + private QName portName; + private QName serviceName; private List<String> handlers; + private List<String> preHandlers; + + private List<String> postHandlers; + + private Map<String, String> properties; + //additional fields private Class<?> epClass; @@ -148,6 +157,16 @@ return handlers; } + public List<String> getPreHandlers() + { + return preHandlers; + } + + public List<String> getPostHandlers() + { + return postHandlers; + } + public boolean isMtomEnabled() { return mtomEnabled; @@ -163,6 +182,16 @@ this.handlers = handlers; } + public void setPreHandlers(List<String> preHandlers) + { + this.preHandlers = preHandlers; + } + + public void setPostHandlers(List<String> postHandlers) + { + this.postHandlers = postHandlers; + } + public void setMtomEnabled(boolean mtomEnabled) { this.mtomEnabled = mtomEnabled; @@ -211,6 +240,15 @@ return this.addressingResponses; } + public Map<String, String> getProperties() + { + return properties; + } + + public void setProperties(Map<String, String> properties) + { + this.properties = properties; + } public void writeTo(Writer writer) throws IOException { @@ -270,12 +308,34 @@ if (this.handlers != null && !this.handlers.isEmpty()) { writer.write("<jaxws:handlers>"); + for (String handler : this.preHandlers) + { + writer.write("<bean class='" + handler + "'/>"); + } for (String handler : this.handlers) { writer.write("<bean class='" + handler + "'/>"); } + for (String handler : this.postHandlers) + { + writer.write("<bean class='" + handler + "'/>"); + } writer.write("</jaxws:handlers>"); } + + if (this.properties != null && !this.properties.isEmpty()) + { + writer.write("<jaxws:properties>"); + for (String key : this.properties.keySet()) + { + String value = this.properties.get(key); + if (value != null) + { + writer.write("<entry key='" + key + "' value='" + value + "'/>"); + } + } + writer.write("</jaxws:properties>"); + } writer.write("</jaxws:endpoint>"); }

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r14213 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-30 12:26:26 -0400 (Sat, 30 Apr 2011) New Revision: 14213 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigMetaDataParser.java Log: [JBWS-3283] Adding parse method from virtual file reference Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigMetaDataParser.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigMetaDataParser.java 2011-04-29 11:02:20 UTC (rev 14212) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigMetaDataParser.java 2011-04-30 16:26:26 UTC (rev 14213) @@ -29,6 +29,7 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URL; import org.jboss.logging.Logger; import org.jboss.wsf.spi.metadata.AbstractHandlerChainsMetaDataParser; @@ -52,6 +53,24 @@ super(); } + public static ConfigRoot parse(URL url) throws IOException + { + InputStream is = null; + try + { + is = url.openStream(); + return parse(is); + } + finally + { + if (is != null) { + try { + is.close(); + } catch (Exception e) {} //ignore + } + } + } + public static ConfigRoot parse(InputStream is) throws IOException { try

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r14212 - in spi/trunk/src: main/java/org/jboss/wsf/spi/metadata and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-29 07:02:20 -0400 (Fri, 29 Apr 2011) New Revision: 14212 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigMetaDataParser.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigRoot.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java spi/trunk/src/main/resources/ spi/trunk/src/main/resources/schema/ spi/trunk/src/main/resources/schema/jbossws-jaxws-config_4_0.xsd spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/config/ spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/config/ConfigMDParserTestCase.java spi/trunk/src/test/resources/metadata/config/ spi/trunk/src/test/resources/metadata/config/test-jaxws-config.xml Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/AbstractHandlerChainsMetaDataParser.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java Log: [JBWS-3283] Providing a stax parser of jaxws endpoint config descriptors and adding the minimal required metadata for them in spi Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/AbstractHandlerChainsMetaDataParser.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/AbstractHandlerChainsMetaDataParser.java 2011-04-28 22:20:13 UTC (rev 14211) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/AbstractHandlerChainsMetaDataParser.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -44,13 +44,19 @@ { protected UnifiedHandlerChainsMetaData parseHandlerChains(XMLStreamReader reader, String nsUri) throws XMLStreamException { + return this.parseHandlerChains(reader, nsUri, nsUri, HANDLER_CHAINS); + } + + protected UnifiedHandlerChainsMetaData parseHandlerChains(XMLStreamReader reader, String nsUri, + String handlerChainsElementNS, String handlerChainsElementName) throws XMLStreamException + { UnifiedHandlerChainsMetaData handlerChains = new UnifiedHandlerChainsMetaData(); while (reader.hasNext()) { switch (reader.nextTag()) { case XMLStreamConstants.END_ELEMENT : { - if (match(reader, nsUri, HANDLER_CHAINS)) + if (match(reader, handlerChainsElementNS, handlerChainsElementName)) { return handlerChains; } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2011-04-28 22:20:13 UTC (rev 14211) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -101,4 +101,30 @@ public static final String ENABLED = "enabled"; public static final String REQUIRED = "required"; + + public static final String JBOSSWS_JAXWS_CONFIG_NS = "urn:jboss:jbossws-jaxws-config:4.0"; + + public static final String JAXWS_CONFIG = "jaxws-config"; + + public static final String ENDPOINT_CONFIG = "endpoint-config"; + + public static final String CLIENT_CONFIG = "client-config"; + + public static final String CONFIG_NAME = "config-name"; + + public static final String PRE_HANDLER_CHAINS = "pre-handler-chains"; + + public static final String POST_HANDLER_CHAINS = "post-handler-chains"; + + public static final String FEATURE = "feature"; + + public static final String PROPERTY = "property"; + + public static final String PROPERTY_NAME = "property-name"; + + public static final String PROPERTY_VALUE = "property-value"; + + public static final String FEATURE_NAME = "feature-name"; + + public static final String FEATURE_DATA = "feature-data"; } Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.metadata.config; + +/** + * A JBossWS client configuration + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public class ClientConfig extends CommonConfig +{ +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,113 @@ +/* + * 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.wsf.spi.metadata.config; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; + +/** + * A common configuration + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public abstract class CommonConfig +{ + private String configName; + private Map<String, Feature> features = new HashMap<String, Feature>(); + private Map<String, String> properties = new HashMap<String, String>(); + private List<UnifiedHandlerChainMetaData> preHandlerChains; + private List<UnifiedHandlerChainMetaData> postHandlerChains; + + public List<UnifiedHandlerChainMetaData> getPostHandlerChains() + { + return postHandlerChains; + } + + public void setPostHandlerChains(List<UnifiedHandlerChainMetaData> postHandlerChain) + { + this.postHandlerChains = postHandlerChain; + } + + public List<UnifiedHandlerChainMetaData> getPreHandlerChains() + { + return preHandlerChains; + } + + public void setPreHandlerChains(List<UnifiedHandlerChainMetaData> preHandlerChains) + { + this.preHandlerChains = preHandlerChains; + } + + public List<UnifiedHandlerChainMetaData> getHandlers(HandlerType type) + { + List<UnifiedHandlerChainMetaData> handlerChains; + if (type == HandlerType.PRE) + handlerChains = getPreHandlerChains(); + else if (type == HandlerType.POST) + handlerChains = getPostHandlerChains(); + else throw new IllegalArgumentException("Invalid handler type: " + type); + return handlerChains; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public boolean hasFeature(String name) + { + return features.containsKey(name); + } + + public void setFeature(Feature feature, boolean enabled) { + + if(enabled) { + features.put(feature.getName(), feature); + } + else + features.remove(feature.getName()); + } + + public void setProperty(String name, String value) + { + properties.put(name, value); + } + + public String getProperty(String name) + { + return properties.get(name); + } + + public Map<String, String> getProperties() { + return properties; + } +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigMetaDataParser.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigMetaDataParser.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigMetaDataParser.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,270 @@ +/* + * 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.wsf.spi.metadata.config; + +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; +import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; +import static org.jboss.wsf.spi.metadata.ParserConstants.*; +import static org.jboss.wsf.spi.util.StAXUtils.elementAsString; +import static org.jboss.wsf.spi.util.StAXUtils.match; + +import java.io.IOException; +import java.io.InputStream; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.metadata.AbstractHandlerChainsMetaDataParser; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.util.StAXUtils; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +/** + * The parser for the configuration metadata + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public class ConfigMetaDataParser extends AbstractHandlerChainsMetaDataParser +{ + private ConfigMetaDataParser() + { + super(); + } + + public static ConfigRoot parse(InputStream is) throws IOException + { + try + { + XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); + return parse(xmlr); + } + catch (XMLStreamException e) + { + throw new IOException(e); + } + } + + public static ConfigRoot parse(XMLStreamReader reader) throws XMLStreamException + { + int iterate; + try + { + iterate = reader.nextTag(); + } + catch (XMLStreamException e) + { + // skip non-tag elements + iterate = reader.nextTag(); + } + ConfigRoot configRoot = null; + switch (iterate) + { + case END_ELEMENT : { + // we're done + break; + } + case START_ELEMENT : { + + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, JAXWS_CONFIG)) + { + ConfigMetaDataParser parser = new ConfigMetaDataParser(); + configRoot = parser.parseConfigRoot(reader); + } + else + { + throw new IllegalStateException("Unexpected element: " + reader.getLocalName()); + } + } + } + return configRoot; + } + + private ConfigRoot parseConfigRoot(XMLStreamReader reader) throws XMLStreamException + { + ConfigRoot configRoot = new ConfigRoot(); + while (reader.hasNext()) + { + switch (reader.nextTag()) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, JAXWS_CONFIG)) + { + return configRoot; + } + else + { + throw new IllegalStateException("Unexpected end tag: " + reader.getLocalName()); + } + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, ENDPOINT_CONFIG)) { + EndpointConfig epConfig = new EndpointConfig(); + parseConfig(reader, epConfig, ENDPOINT_CONFIG); + configRoot.addEndpointConfig(epConfig); + } + else if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, CLIENT_CONFIG)) { + ClientConfig clConfig = new ClientConfig(); + parseConfig(reader, clConfig, CLIENT_CONFIG); + configRoot.addClientConfig(clConfig); + } + else + { + throw new IllegalStateException("Unexpected element: " + reader.getLocalName()); + } + } + } + } + throw new IllegalStateException("Reached end of xml document unexpectedly"); + } + + private void parseConfig(XMLStreamReader reader, CommonConfig config, String configElement) throws XMLStreamException + { + while (reader.hasNext()) + { + switch (reader.nextTag()) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, configElement)) + { + return; + } + else + { + throw new IllegalStateException("Unexpected end tag: " + reader.getLocalName()); + } + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, CONFIG_NAME)) { + config.setConfigName(elementAsString(reader)); + } + else if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, PRE_HANDLER_CHAINS)) { + UnifiedHandlerChainsMetaData uhcmd = parseHandlerChains(reader, JAVAEE_NS, JBOSSWS_JAXWS_CONFIG_NS, PRE_HANDLER_CHAINS); + config.setPreHandlerChains(uhcmd.getHandlerChains()); + } + else if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, POST_HANDLER_CHAINS)) { + UnifiedHandlerChainsMetaData uhcmd = parseHandlerChains(reader, JAVAEE_NS, JBOSSWS_JAXWS_CONFIG_NS, POST_HANDLER_CHAINS); + config.setPostHandlerChains(uhcmd.getHandlerChains()); + } + else if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, FEATURE)) { + config.setFeature(parseFeature(reader), true); + } + else if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, PROPERTY)) { + parseProperty(reader, config); + } + else + { + throw new IllegalStateException("Unexpected element: " + reader.getLocalName()); + } + } + } + } + throw new IllegalStateException("Reached end of xml document unexpectedly"); + } + + private void parseProperty(XMLStreamReader reader, CommonConfig config) throws XMLStreamException + { + String name = null; + String value = null; + while (reader.hasNext()) + { + switch (reader.nextTag()) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, PROPERTY)) + { + if (name == null) + { + throw new IllegalStateException("Could not get property name!"); + } + config.setProperty(name, value); + return; + } + else + { + throw new IllegalStateException("Unexpected end tag: " + reader.getLocalName()); + } + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, PROPERTY_NAME)) { + name = elementAsString(reader); + } + else if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, PROPERTY_VALUE)) { + value = elementAsString(reader); + } + else + { + throw new IllegalStateException("Unexpected element: " + reader.getLocalName()); + } + } + } + } + throw new IllegalStateException("Reached end of xml document unexpectedly"); + } + + private Feature parseFeature(XMLStreamReader reader) throws XMLStreamException + { + Feature feature = null; + while (reader.hasNext()) + { + switch (reader.nextTag()) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, FEATURE)) + { + if (feature == null) + { + throw new IllegalStateException("Could not read feature name!"); + } + return feature; + } + else + { + throw new IllegalStateException("Unexpected end tag: " + reader.getLocalName()); + } + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, FEATURE_NAME)) { + feature = new Feature(elementAsString(reader)); + } + else if (match(reader, JBOSSWS_JAXWS_CONFIG_NS, FEATURE_DATA)) { + //not implemented yet + Logger.getLogger(this.getClass()).warn("Feature data not supported yet!"); + while (reader.hasNext()) { + reader.next(); + if (reader.isEndElement() && match(reader, JBOSSWS_JAXWS_CONFIG_NS, FEATURE_DATA)) + { + break; + } + } + } + else + { + throw new IllegalStateException("Unexpected element: " + reader.getLocalName()); + } + } + } + } + throw new IllegalStateException("Reached end of xml document unexpectedly"); + } +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigRoot.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigRoot.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/ConfigRoot.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,111 @@ +/* + * 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.wsf.spi.metadata.config; + +import java.util.ArrayList; +import java.util.List; + +/** + * A JBossWS configuration + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public class ConfigRoot +{ + private List<ClientConfig> clientConfigList = new ArrayList<ClientConfig>(); + private List<EndpointConfig> endpointConfigList = new ArrayList<EndpointConfig>(); + + public List<ClientConfig> getClientConfig() + { + return clientConfigList; + } + + public void addClientConfig(ClientConfig clientConfig) + { + this.clientConfigList.add(clientConfig); + } + + public void addEndpointConfig(EndpointConfig endpointConfig) + { + this.endpointConfigList.add(endpointConfig); + } + + public void setClientConfig(List<ClientConfig> clientConfig) + { + this.clientConfigList = clientConfig; + } + + public List<EndpointConfig> getEndpointConfig() + { + return endpointConfigList; + } + + public void setEndpointConfig(List<EndpointConfig> endpointConfig) + { + this.endpointConfigList = endpointConfig; + } + + public ClientConfig getClientConfigByName(String configName) + { + ClientConfig config = null; + for(ClientConfig aux : clientConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && clientConfigList.size() == 1) + config = clientConfigList.get(0); + + return config; + } + + public EndpointConfig getEndpointConfigByName(String configName) + { + EndpointConfig config = null; + for(EndpointConfig aux : endpointConfigList) + { + if (aux.getConfigName().equals(configName)) + { + config = aux; + break; + } + } + + if (config == null && endpointConfigList.size() == 1) + config = endpointConfigList.get(0); + + return config; + } + + public CommonConfig getConfigByName(String name) + { + CommonConfig config = getClientConfigByName(name); + if(null == config) + config = getEndpointConfigByName(name); + return config; + } +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/EndpointConfig.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.metadata.config; + +/** + * A JBossWS endpoint configuration + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public class EndpointConfig extends CommonConfig +{ +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/Feature.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.metadata.config; + +public class Feature +{ + private String name; + + private Object data; + + public Feature(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public Object getData() + { + return data; + } + + public void setData(Object data) + { + this.data = data; + } +} Added: spi/trunk/src/main/resources/schema/jbossws-jaxws-config_4_0.xsd =================================================================== --- spi/trunk/src/main/resources/schema/jbossws-jaxws-config_4_0.xsd (rev 0) +++ spi/trunk/src/main/resources/schema/jbossws-jaxws-config_4_0.xsd 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:jboss:jbossws-jaxws-config:4.0" + xmlns:tns="urn:jboss:jbossws-jaxws-config:4.0" + xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.1"> + + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + This is the schema definition for JBossWS JAXWS configurations. + It relies on the handler definitions that are part of the standard J2EE-1.5 deployment descriptors. + ]]> + </xsd:documentation> + </xsd:annotation> + + <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="javaee_web_services_1_2.xsd"/> + + <xsd:element name="jaxws-config" type="tns:jaxwsConfigType"/> + <xsd:complexType name="jaxwsConfigType"> + <xsd:sequence> + <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="endpointConfigType"> + <xsd:complexContent> + <xsd:extension base="tns:commonConfigType"/> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="clientConfigType"> + <xsd:complexContent> + <xsd:extension base="tns:commonConfigType"/> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="commonConfigType"> + <xsd:sequence> + <xsd:element name="config-name" type="xsd:string"/> + <xsd:element name="pre-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> + <xsd:element name="post-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> + <xsd:element name="feature" type="tns:featureType"" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="featureType"> + <xsd:sequence> + <xsd:element name="feature-name" type="xsd:string"/> + <xsd:element name="feature-data" type="xsd:any" minOccurs="0"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="propertyType"> + <xsd:sequence> + <xsd:element name="property-name" type="xsd:string"/> + <xsd:element name="property-value" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + +</xsd:schema> Added: spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/config/ConfigMDParserTestCase.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/config/ConfigMDParserTestCase.java (rev 0) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/metadata/config/ConfigMDParserTestCase.java 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,75 @@ +/* + * 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.wsf.spi.metadata.config; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.List; + +import junit.framework.TestCase; + +import org.jboss.wsf.spi.metadata.config.ClientConfig; +import org.jboss.wsf.spi.metadata.config.ConfigMetaDataParser; +import org.jboss.wsf.spi.metadata.config.ConfigRoot; +import org.jboss.wsf.spi.metadata.config.EndpointConfig; + +/** + * Test the UnifiedHandlersChainsMetaDataParser + * + * @author alessio.soldano(a)jboss.com + * @since 29-Apr-2011 + */ +public class ConfigMDParserTestCase extends TestCase +{ + public void testParse() throws Exception + { + InputStream is = new FileInputStream(new File("src/test/resources/metadata/config/test-jaxws-config.xml")); + ConfigRoot metadata = ConfigMetaDataParser.parse(is); + + List<ClientConfig> clientConfigs = metadata.getClientConfig(); + assertEquals(1, clientConfigs.size()); + ClientConfig cc = clientConfigs.get(0); + assertEquals("Standard Client", cc.getConfigName()); + assertTrue(cc.getProperties().isEmpty()); + assertNull(cc.getPreHandlerChains()); + assertNull(cc.getPostHandlerChains()); + + List<EndpointConfig> endpointConfigs = metadata.getEndpointConfig(); + assertEquals(2, endpointConfigs.size()); + + EndpointConfig ec = metadata.getEndpointConfigByName("Standard Endpoint"); + assertEquals(1, ec.getPreHandlerChains().size()); + assertEquals(1, ec.getPreHandlerChains().get(0).getHandlers().size()); + assertEquals(1, ec.getPostHandlerChains().size()); + assertEquals(2, ec.getPostHandlerChains().get(0).getHandlers().size()); + assertEquals(2, ec.getProperties().size()); + assertEquals("value1", ec.getProperty("name1")); + assertEquals("value2", ec.getProperty("name2")); + + ec = metadata.getEndpointConfigByName(".NET friendly Endpoint"); + assertNull(ec.getPreHandlerChains()); + assertNull(ec.getPostHandlerChains()); + assertTrue(ec.getProperties().isEmpty()); + assertTrue(ec.hasFeature("http://org.jboss.ws/binding/wsdl/dotnet")); + } +} \ No newline at end of file Added: spi/trunk/src/test/resources/metadata/config/test-jaxws-config.xml =================================================================== --- spi/trunk/src/test/resources/metadata/config/test-jaxws-config.xml (rev 0) +++ spi/trunk/src/test/resources/metadata/config/test-jaxws-config.xml 2011-04-29 11:02:20 UTC (rev 14212) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + <pre-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </pre-handler-chains> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + <property> + <property-name>name1</property-name> + <property-value>value1</property-value> + </property> + <property> + <property-name>name2</property-name> + <property-value>value2</property-value> + </property> + </endpoint-config> + + <endpoint-config> + <config-name>.NET friendly Endpoint</config-name> + <feature> + <feature-name>http://org.jboss.ws/binding/wsdl/dotnet</feature-name> + <feature-data> + foo-bar + <foo>foo</foo> + <bar>bar</bar> + </feature-data> + </feature> + </endpoint-config> + + <client-config> + <config-name>Standard Client</config-name> + </client-config> + +</jaxws-config> \ No newline at end of file

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14211 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/extensions/eventing/jaxws and 21 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-28 18:20:13 -0400 (Thu, 28 Apr 2011) New Revision: 14211 Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractEventSourceEndpoint.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestService.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestService.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsa/NotifyImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsse/TestService.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1814/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/EndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2011/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3182/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarReplyEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java Log: [JBWS-3282] Use new @EndpointConfig from jbossws-api Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -1,56 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Defines an endpoint or client configuration. - * This annotation is valid on an endpoint implementaion bean or a SEI. - * - * @author Heiko.Braun(a)jboss.org - * @since 16.01.2007 - */ -@Retention(value = RetentionPolicy.RUNTIME) -@Target(value = { ElementType.TYPE }) -public @interface EndpointConfig { - - /** - * The optional config-name element gives the configuration name that must be present in - * the configuration given by element config-file. - * - * Server side default: Standard Endpoint - * Client side default: Standard Client - */ - String configName() default ""; - - /** - * The optional config-file element is a URL or resource name for the configuration. - * - * Server side default: standard-jaxws-endpoint-config.xml - * Client side default: standard-jaxws-client-config.xml - */ - String configFile() default ""; -} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractEventSourceEndpoint.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractEventSourceEndpoint.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractEventSourceEndpoint.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -35,13 +35,13 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.common.EventingEndpointBase; import org.jboss.ws.extensions.eventing.mgmt.Filter; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionError; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionTicket; +import org.jboss.wsf.spi.annotation.EndpointConfig; /** * @author Heiko.Braun(a)jboss.org Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -38,13 +38,13 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; -import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.extensions.eventing.EventingConstants; import org.jboss.ws.extensions.eventing.common.EventingEndpointBase; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionError; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.w3c.dom.Element; /** Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -37,7 +37,6 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.core.jaxws.client.NativeServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; @@ -55,6 +54,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -24,9 +24,9 @@ import javax.jws.WebService; import javax.xml.ws.WebServiceProvider; -import org.jboss.ws.annotation.EndpointConfig; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -23,7 +23,7 @@ import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; /** Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestService.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestService.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/EncryptTestService.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -23,7 +23,7 @@ import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; /** Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestService.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestService.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestService.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -23,7 +23,7 @@ import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; /** * WCF Interoperability Plug-fest - November 2007 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsa/NotifyImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsa/NotifyImpl.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsa/NotifyImpl.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.interop.wsa; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import javax.jws.WebMethod; import javax.jws.Oneway; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsse/TestService.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsse/TestService.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/wsse/TestService.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.interop.wsse; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import javax.jws.WebMethod; import javax.jws.WebResult; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpoint.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -24,7 +24,7 @@ import javax.jws.WebMethod; import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; @WebService @EndpointConfig(configName = "Custom Client Config", configFile = "META-INF/jaxws-client-config.xml") Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -34,7 +34,7 @@ import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; @WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/handlerlifecycle") @HandlerChain(file = "jaxws-server-handlers.xml") Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1814/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1814/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1814/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -26,7 +26,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; @WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbws1814") @EndpointConfig(configName = "Standard WSSecurity Endpoint") Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -30,7 +30,7 @@ import javax.xml.ws.WebServiceContext; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -30,7 +30,7 @@ import javax.xml.ws.WebServiceContext; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/EndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/EndpointImpl.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/EndpointImpl.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -23,7 +23,7 @@ import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; /** * Test Endpoint to test UsernameToken authorization / authentication Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2011/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2011/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2011/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -29,7 +29,7 @@ import javax.xml.ws.WebServiceContext; import org.jboss.ws.Constants; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/TestEndpointImpl.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -26,7 +26,7 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.BindingType; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; /** Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -30,7 +30,7 @@ import javax.xml.ws.WebServiceContext; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -26,7 +26,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; /** * Test Endpoint to test MTOM detection. Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3182/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3182/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3182/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -27,7 +27,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/IWebsvcImpl.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -25,7 +25,7 @@ import javax.jws.WebParam; import javax.jws.WebService; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws771.IWebsvc", serviceName = "JBWS771Service") Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -42,7 +42,7 @@ import javax.xml.ws.addressing.JAXWSAConstants; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.AuthMethod; import org.jboss.wsf.spi.annotation.TransportGuarantee; import org.jboss.wsf.spi.annotation.WebContext; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarReplyEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarReplyEndpointImpl.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarReplyEndpointImpl.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -40,7 +40,7 @@ import org.jboss.test.ws.jaxws.samples.dar.generated.reply.DarResponse; import org.jboss.test.ws.jaxws.samples.dar.generated.reply.Route; import org.jboss.test.ws.jaxws.samples.dar.generated.reply.Stop; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; /** * The client endpoint receiving DAR responses Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -25,7 +25,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; /** Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -26,7 +26,7 @@ import javax.jws.WebService; import javax.xml.ws.soap.Addressing; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; @WebService ( Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -27,7 +27,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; @WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/samples/wssecurity") @EndpointConfig(configName = "Standard WSSecurity Endpoint") Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -31,7 +31,7 @@ import javax.xml.ws.WebServiceContext; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; /** * The SEI implementation used by the SimpleUsernameTestCase Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2011-04-28 22:16:33 UTC (rev 14210) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2011-04-28 22:20:13 UTC (rev 14211) @@ -27,7 +27,7 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.wsf.spi.annotation.EndpointConfig; @WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecuritypolicy", wsdlLocation="WEB-INF/wsdl/HelloService.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC)

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14210 - api/trunk/src/main/java/org/jboss/wsf/spi/annotation.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-28 18:16:33 -0400 (Thu, 28 Apr 2011) New Revision: 14210 Added: api/trunk/src/main/java/org/jboss/wsf/spi/annotation/EndpointConfig.java Log: [JBWS-3282] Adding @EndpointConfig to jbossws-api Added: api/trunk/src/main/java/org/jboss/wsf/spi/annotation/EndpointConfig.java =================================================================== --- api/trunk/src/main/java/org/jboss/wsf/spi/annotation/EndpointConfig.java (rev 0) +++ api/trunk/src/main/java/org/jboss/wsf/spi/annotation/EndpointConfig.java 2011-04-28 22:16:33 UTC (rev 14210) @@ -0,0 +1,52 @@ +/* + * 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.wsf.spi.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Defines an endpoint configuration. + * This annotation is valid on an endpoint implementation bean or a SEI. + * + */ +@Retention(value = RetentionPolicy.RUNTIME) +@Target(value = { ElementType.TYPE }) +public @interface EndpointConfig { + + /** + * The optional config-name element gives the configuration name that must be present in + * the configuration given by element config-file. + * + * Default: Standard Endpoint + */ + String configName() default ""; + + /** + * The optional config-file element is a URL or resource name for the configuration. + * The default value references the current AS configuration. + * + */ + String configFile() default ""; +}

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14209 - in stack/cxf/trunk: modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver and 19 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-28 06:57:21 -0400 (Thu, 28 Apr 2011) New Revision: 14209 Added: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestinationFactory.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.txt stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml Removed: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusApplicationContext.java stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/commons/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerSpringConfigurer.java Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser/JaxwsEndpointDefinitionParser.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java stack/cxf/trunk/pom.xml Log: [JBWS-3272] Upgrade to Apache CXF 2.4 Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -30,6 +30,7 @@ import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.http.DestinationRegistry; import org.apache.cxf.transport.http_jaxws_spi.HttpHandlerImpl; import org.apache.cxf.transport.http_jaxws_spi.JAXWSHttpSpiDestination; import org.jboss.ws.httpserver_httpspi.HttpExchangeDelegate; @@ -53,16 +54,14 @@ private static final long serialVersionUID = 1L; - private HttpServerTransportFactory factory; private HttpServerEngineFactory serverEngineFactory; private HttpServerEngine engine; private URL url; - public HttpServerDestination(Bus b, HttpServerTransportFactory factory, EndpointInfo ei) throws IOException + public HttpServerDestination(Bus b, DestinationRegistry registry, EndpointInfo ei) throws IOException { - super(b, ei); - this.factory = factory; - this.serverEngineFactory = factory.getServerEngineFactory(); + super(b, registry, ei); + this.serverEngineFactory = getServerEngineFactory(); getAddressValue(ei, true); //generate address if not specified this.url = new URL(ei.getAddress()); } @@ -73,12 +72,19 @@ return LOG; } - public void finalizeConfig() throws IOException + public void finalizeConfig() { engine = serverEngineFactory.retrieveHttpServerEngine(url.getPort()); if (engine == null) { - engine = serverEngineFactory.createHttpServerEngine(url.getHost(), url.getPort(), url.getProtocol()); + try + { + engine = serverEngineFactory.createHttpServerEngine(url.getHost(), url.getPort(), url.getProtocol()); + } + catch (IOException e) + { + throw new RuntimeException(e); + } } if (!url.getProtocol().equals(engine.getProtocol())) { @@ -86,6 +92,19 @@ + engine.getProtocol() + "\" for \"" + url + "\""); } } + + protected HttpServerEngineFactory getServerEngineFactory() + { + HttpServerEngineFactory serverEngineFactory = getBus().getExtension(HttpServerEngineFactory.class); + // If it's not there, then create it and register it. + // Spring may override it later, but we need it here for default + // with no spring configuration. + if (serverEngineFactory == null) + { + serverEngineFactory = new HttpServerEngineFactory(bus); + } + return serverEngineFactory; + } /** * Activate receipt of incoming messages. @@ -114,13 +133,6 @@ engine.removeHandler(endpointInfo.getAddress()); } - @Override - public void shutdown() - { - factory.removeDestination(endpointInfo); - super.shutdown(); - } - class Handler extends HttpHandlerImpl implements HttpHandler { Added: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestinationFactory.java =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestinationFactory.java (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestinationFactory.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -0,0 +1,50 @@ +/* + * 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.wsf.stack.cxf.addons.transports.httpserver; + +import java.io.IOException; + +import org.apache.cxf.Bus; +import org.apache.cxf.common.injection.NoJSR250Annotations; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.http.AbstractHTTPDestination; +import org.apache.cxf.transport.http.DestinationRegistry; +import org.apache.cxf.transport.http.HttpDestinationFactory; + + +/** + * Factory for HttpServerDestination + * + * @author alessio.soldano(a)jboss.com + * @since 22-Apr-2011 + * + */ +@NoJSR250Annotations() +public class HttpServerDestinationFactory implements HttpDestinationFactory +{ + @Override + public AbstractHTTPDestination createDestination(EndpointInfo endpointInfo, Bus bus, DestinationRegistry registry) + throws IOException + { + return new HttpServerDestination(bus, registry, endpointInfo); + } +} Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineFactory.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -140,7 +140,10 @@ HttpServerEngine[] engines = portMap.values().toArray(new HttpServerEngine[0]); for (HttpServerEngine engine : engines) { - engine.shutdown(); + if (engine.getBus() == getBus()) + { + engine.shutdown(); + } } } Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerTransportFactory.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,118 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.addons.transports.httpserver; - -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import javax.annotation.PostConstruct; -import javax.annotation.Resource; - -import org.apache.cxf.Bus; -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.Destination; -import org.apache.cxf.transport.DestinationFactory; -import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; - -/** - * A Destination/Transport factory for the JDK6 httpserver - * - * @author alessio.soldano(a)jboss.com - * @since 19-Aug-2010 - * - */ -public class HttpServerTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory -{ - private Map<String, HttpServerDestination> destinations = new ConcurrentHashMap<String, HttpServerDestination>(); - - public HttpServerTransportFactory() - { - super(); - } - - @Resource - public void setBus(Bus b) - { - super.setBus(b); - } - - @PostConstruct - public void finalizeConfig() - { - if (null == bus) - { - return; - } - // This call will register the server engine factory - // with the Bus. - getServerEngineFactory(); - } - - protected HttpServerEngineFactory getServerEngineFactory() - { - HttpServerEngineFactory serverEngineFactory = getBus().getExtension(HttpServerEngineFactory.class); - // If it's not there, then create it and register it. - // Spring may override it later, but we need it here for default - // with no spring configuration. - if (serverEngineFactory == null) - { - serverEngineFactory = new HttpServerEngineFactory(bus); - serverEngineFactory.setBus(getBus()); - } - return serverEngineFactory; - } - - public Destination getDestination(EndpointInfo endpointInfo) throws IOException - { - String addr = endpointInfo.getAddress(); - HttpServerDestination destination = addr == null ? null : destinations.get(addr); - if (destination == null) - { - destination = createDestination(endpointInfo); - } - return destination; - } - - private synchronized HttpServerDestination createDestination(EndpointInfo endpointInfo) throws IOException - { - String addr = endpointInfo.getAddress(); - HttpServerDestination destination = addr == null ? null : destinations.get(addr); - if (destination == null) - { - destination = new HttpServerDestination(getBus(), this, endpointInfo); - destinations.put(endpointInfo.getAddress(), destination); - configure(destination); - destination.finalizeConfig(); - } - return destination; - } - - /** - * This function removes the destination for a particular endpoint. - */ - void removeDestination(EndpointInfo ei) - { - destinations.remove(ei.getAddress()); - } - -} Added: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.txt =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.txt (rev 0) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.txt 2011-04-28 10:57:21 UTC (rev 14209) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerDestinationFactory::true \ No newline at end of file Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/bus-extensions.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<extensions xmlns="http://cxf.apache.org/bus/extension"> - - <extension class="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" deferred="false"> - <namespace>http://cxf.apache.org/transports/http</namespace> - <namespace>http://cxf.apache.org/transports/http/configuration</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/http</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> - </extension> -</extensions> Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf-extension-httpserver.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> - - <bean class="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" - id="org.jboss.wsf.stack.cxf.addons.transports.httpserver.HttpServerTransportFactory" - lazy-init="true"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://cxf.apache.org/transports/http</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - <value>http://schemas.xmlsoap.org/wsdl/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - </list> - </property> - </bean> - -</beans> Deleted: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/resources/META-INF/cxf/cxf.extension 2011-04-28 10:57:21 UTC (rev 14209) @@ -1 +0,0 @@ -META-INF/cxf/cxf-extension-httpserver.xml \ No newline at end of file Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusApplicationContext.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusApplicationContext.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusApplicationContext.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,121 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.client.configuration; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.cxf.bus.spring.BusApplicationContext; -import org.springframework.context.ApplicationContext; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; - -/** - * A JBossWS version of @see{org.apache.cxf.bus.spring.BusApplicationContext} that - * allows for getting the default bus configuration from the JBossWS - * integration. - * - * @author alessio.soldano(a)jboss.com - * @since 25-May-2010 - * - */ -public class JBossWSBusApplicationContext extends BusApplicationContext -{ - private static final String JBWS_INTEGRATION_CXF_CFG_FILE = "META-INF/cxf/jbossws-cxf.xml"; - - private static final String JBWS_CXF_EXT_CFG_FILE = "classpath*:META-INF/cxf/cxf-extension-jbossws.xml"; - - private static final String DEFAULT_CXF_EXT_CFG_FILE = "classpath*:META-INF/cxf/cxf.extension"; - - private final boolean jbwsIncludeDefaults; - private final boolean ready; - - public JBossWSBusApplicationContext(String[] cf, boolean include, ApplicationContext parent) - { - super(cf, false, parent); - this.jbwsIncludeDefaults = include; - this.ready = true; - refresh(); - } - - public JBossWSBusApplicationContext(URL[] url, boolean include, ApplicationContext parent) - { - super(url, false, parent); - this.jbwsIncludeDefaults = include; - this.ready = true; - refresh(); - } - - @Override - protected Resource[] getConfigResources() - { - List<Resource> resources = new ArrayList<Resource>(); - if (ready) - { - if (jbwsIncludeDefaults) - { - try - { - PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(Thread - .currentThread().getContextClassLoader()); - //jbossws-cxf.xml with our integration defaults for the Bus - Collections.addAll(resources, resolver.getResources(JBWS_INTEGRATION_CXF_CFG_FILE)); - //cxf-extensions-jbossws.xml, for customers' jbossws additions - Collections.addAll(resources, resolver.getResources(JBWS_CXF_EXT_CFG_FILE)); - //CXF vanilla extensions, need to load them here as super skips defaults loading - Resource[] exts = resolver.getResources(DEFAULT_CXF_EXT_CFG_FILE); - for (Resource r : exts) - { - InputStream is = r.getInputStream(); - BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8")); - String line = rd.readLine(); - while (line != null) - { - if (!"".equals(line)) - { - resources.add(resolver.getResource(line)); - } - line = rd.readLine(); - } - is.close(); - } - - } - catch (IOException ex) - { - // ignore - } - } - //recurse to super; this loads everything else the user specified - Resource[] superResources = super.getConfigResources(); - if (superResources != null) - Collections.addAll(resources, superResources); - } - return resources.isEmpty() ? null : (Resource[]) resources.toArray(new Resource[resources.size()]); - } -} Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * 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. * @@ -21,40 +21,13 @@ */ package org.jboss.wsf.stack.cxf.client.configuration; -import java.lang.ref.WeakReference; -import java.util.Collection; import java.util.HashMap; -import java.util.LinkedList; import java.util.Map; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; - import org.apache.cxf.Bus; import org.apache.cxf.bus.CXFBusFactory; import org.apache.cxf.bus.extension.ExtensionManagerBus; import org.apache.cxf.configuration.Configurer; -import org.apache.cxf.ws.addressing.Names; -import org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder; -import org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider; -import org.apache.cxf.ws.policy.AssertionBuilderRegistry; -import org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl; -import org.apache.cxf.ws.policy.PolicyBuilder; -import org.apache.cxf.ws.policy.PolicyBuilderImpl; -import org.apache.cxf.ws.policy.PolicyEngine; -import org.apache.cxf.ws.policy.PolicyEngineImpl; -import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry; -import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl; -import org.apache.cxf.ws.policy.PolicyProvider; -import org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider; -import org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry; -import org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider; -import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder; -import org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder; -import org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider; -import org.apache.cxf.ws.rm.RMManager; -import org.apache.cxf.ws.rm.policy.RMAssertionBuilder; -import org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider; import org.jboss.wsf.stack.cxf.client.ProviderImpl; /** @@ -77,81 +50,14 @@ extensions.put(Configurer.class, new JBossWSNonSpringConfigurer(new BeanCustomizer())); } - preparePolicyEngine(extensions); - //Explicitly ask for the ProviderImpl.class.getClassLoader() to be used for getting //cxf bus extensions (as that classloader is the jaxws-client module one which 'sees' all //extensions, unless different dependencies are explicitly set) - Bus bus = new ExtensionManagerBus(extensions, properties, ProviderImpl.class.getClassLoader()); - - initPolicyEngine((PolicyEngineImpl)extensions.get(PolicyEngine.class), bus); + ExtensionManagerBus bus = new ExtensionManagerBus(extensions, properties, ProviderImpl.class.getClassLoader()); possiblySetDefaultBus(bus); initializeBus(bus); + bus.initialize(); return bus; } - - @SuppressWarnings("rawtypes") - private static void preparePolicyEngine(Map<Class, Object> extensions) - { - PolicyEngineImpl engine = new PolicyEngineImpl(true); - extensions.put(PolicyEngine.class, engine); - DomainExpressionBuilderRegistry domainExpBuilderRegistry = new DomainExpressionBuilderRegistry(); - extensions.put(DomainExpressionBuilderRegistry.class, domainExpBuilderRegistry); - } - - private static void initPolicyEngine(PolicyEngineImpl engine, Bus bus) - { - engine.setBus(bus); - AssertionBuilderRegistry assertionBuilderRegistry = new AssertionBuilderRegistryImpl(bus); - PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl(bus); - PolicyBuilderImpl policyBuilder = new PolicyBuilderImpl(); - policyBuilder.setBus(bus); - policyBuilder.setAssertionBuilderRegistry(assertionBuilderRegistry); - bus.setExtension(policyBuilder, PolicyBuilder.class); - Collection<PolicyProvider> policyProviders = engine.getPolicyProviders(); - Wsdl11AttachmentPolicyProvider wsdl11PolicyAttachmentProvider = new Wsdl11AttachmentPolicyProvider(bus); - wsdl11PolicyAttachmentProvider.setBuilder(policyBuilder); - wsdl11PolicyAttachmentProvider.setRegistry(engine.getRegistry()); - policyProviders.add(wsdl11PolicyAttachmentProvider); - ServiceModelPolicyProvider serviceModelPolicyProvider = new ServiceModelPolicyProvider(bus); - serviceModelPolicyProvider.setBuilder(policyBuilder); - serviceModelPolicyProvider.setRegistry(engine.getRegistry()); - policyProviders.add(serviceModelPolicyProvider); - - //MTOM Policy - assertionBuilderRegistry.register(new MTOMAssertionBuilder()); - policyInterceptorProviderRegistry.register(new MTOMPolicyInterceptorProvider()); - - //RM - RMManager rmManager = new RMManager(); - rmManager.init(bus); - - //RM Policy - policyInterceptorProviderRegistry.register(new RMPolicyInterceptorProvider(bus)); - try - { - assertionBuilderRegistry.register(new RMAssertionBuilder()); - } - catch (JAXBException e) - { - throw new RuntimeException(e); - } - - //Addressing Policy - policyInterceptorProviderRegistry.register(new AddressingPolicyInterceptorProvider()); - assertionBuilderRegistry.register(new AddressingAssertionBuilder(bus)); - Collection<QName> addressingKnownEls = new LinkedList<QName>(); - addressingKnownEls.add(new QName("http://schemas.xmlsoap.org/ws/2004/08/addressing/policy", Names.WSAW_USING_ADDRESSING_NAME)); - addressingKnownEls.add(new QName(Names.WSA_NAMESPACE_WSDL_NAME_OLD, Names.WSAW_USING_ADDRESSING_NAME)); - addressingKnownEls.add(Names.WSAW_USING_ADDRESSING_QNAME); - PrimitiveAssertionBuilder primitiveAssertionBuilder = new PrimitiveAssertionBuilder(addressingKnownEls); - primitiveAssertionBuilder.setBus(bus); - assertionBuilderRegistry.register(primitiveAssertionBuilder); - } - - @Override - protected void initializeBus(Bus bus) { - super.initializeBus(bus); - } } Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -31,6 +31,7 @@ import org.apache.cxf.buslifecycle.BusLifeCycleListener; import org.apache.cxf.buslifecycle.BusLifeCycleManager; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.configuration.Configurer; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; @@ -56,6 +57,11 @@ super(context); } + /** + * We override the Apache CXF method to skip the checks on cxf.xml conf file as that would prevent + * creating a Spring version of the bus when the jbossws-cxf.xml is available; generally speaking + * the JBossWS-CXF integration requires a Spring bus to be created by Spring bus factories. + */ @Override public Bus createBus(String cfgFiles[], boolean includeDefaults) { @@ -75,7 +81,7 @@ { try { - return finishCreatingBus(new JBossWSBusApplicationContext(urls, includeDefaults, getApplicationContext())); + return finishCreatingBus(new BusApplicationContext(urls, includeDefaults, getApplicationContext())); } catch (BeansException ex) { @@ -89,6 +95,8 @@ final Bus bus = (Bus) bac.getBean(Bus.DEFAULT_BUS_ID); bus.setExtension(bac, BusApplicationContext.class); + + setConfigurer(bus); possiblySetDefaultBus(bus); @@ -102,7 +110,7 @@ { try { - return new JBossWSBusApplicationContext(cfgFiles, includeDefaults, getApplicationContext()); + return new BusApplicationContext(cfgFiles, includeDefaults, getApplicationContext()); } catch (BeansException ex) { @@ -113,7 +121,7 @@ Thread.currentThread().setContextClassLoader(BusApplicationContext.class.getClassLoader()); try { - return new JBossWSBusApplicationContext(cfgFiles, includeDefaults, getApplicationContext()); + return new BusApplicationContext(cfgFiles, includeDefaults, getApplicationContext()); } finally { @@ -126,6 +134,13 @@ } } } + + private void setConfigurer(Bus bus) + { + JBossWSSpringConfigurer configurer = new JBossWSSpringConfigurer(bus.getExtension(Configurer.class)); + configurer.setCustomizer(new BeanCustomizer()); + bus.setExtension(configurer, Configurer.class); + } void registerAppContextLifeCycleListener(final Bus bus, final BusApplicationContext bac) { Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringConfigurer.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -21,32 +21,52 @@ */ package org.jboss.wsf.stack.cxf.client.configuration; +import org.apache.cxf.configuration.Configurer; import org.apache.cxf.configuration.spring.ConfigurerImpl; +import org.apache.cxf.extension.BusExtension; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; /** - * A CXF configurer (Spring based) that sets JBossWS stuff / customizations / properties etc. in CXF configurable beans + * A CXF delegate configurer that sets JBossWS stuff / customizations / properties etc. in CXF configurable beans + * (to be used for Spring based bus) * * @author alessio.soldano(a)jboss.com * @since 05-Oct-2009 */ -public class JBossWSSpringConfigurer extends ConfigurerImpl implements JBossWSConfigurer +public class JBossWSSpringConfigurer implements JBossWSConfigurer, ApplicationContextAware, BusExtension { private BeanCustomizer customizer; + private Configurer delegate; + + public JBossWSSpringConfigurer(Configurer delegate) + { + this.delegate = delegate; + } @Override public void configureBean(Object beanInstance) { customConfigure(beanInstance); - super.configureBean(beanInstance); + delegate.configureBean(beanInstance); } @Override public void configureBean(String name, Object beanInstance) { customConfigure(beanInstance); - super.configureBean(name, beanInstance); + delegate.configureBean(name, beanInstance); } + public void addApplicationContext(ApplicationContext ctx) + { + if (delegate instanceof ConfigurerImpl) + { + ((ConfigurerImpl)delegate).addApplicationContext(ctx); + } + } + protected synchronized void customConfigure(Object beanInstance) { if (customizer != null) @@ -64,4 +84,23 @@ { this.customizer = customizer; } + + @Override + public Class<?> getRegistrationType() + { + if (delegate instanceof BusExtension) + { + return ((BusExtension)delegate).getRegistrationType(); + } + throw new RuntimeException("Delegate is not a BusExtension instance: " + delegate); + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException + { + if (delegate instanceof ApplicationContextAware) + { + ((ApplicationContextAware)delegate).setApplicationContext(applicationContext); + } + } } Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2011-04-28 10:57:21 UTC (rev 14209) @@ -49,6 +49,7 @@ <xsd:element name="parameter" type="parameterType" /> </xsd:choice> <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="ignore" type="xsd:boolean" /> </xsd:complexType> <xsd:complexType name="return-typeType"> @@ -72,7 +73,7 @@ <xsd:attribute name="typeName" type="xsd:string" /> <xsd:attribute name="mappedName" type="xsd:string" /> <xsd:attribute name="nillable" type="xsd:boolean" /> - <xsd:attribute name="flag" type="xsd:boolean" /> + <xsd:attribute name="flat" type="xsd:boolean" /> <xsd:attribute name="ignore" type="xsd:boolean" /> <xsd:attribute name="componentType" type="xsd:string" /> <xsd:attribute name="keyType" type="xsd:string" /> Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/java2wsbeans.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?>  -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - -<bean id='JaxwsServiceBuilderBean' class='org.apache.cxf.jaxws.JaxwsServiceBuilder' scope="prototype" /> -<bean id='SimpleServiceBuilderBean' class='org.apache.cxf.simple.SimpleServiceBuilder' scope="prototype" /> - -<bean id='JaxbDatabindingBean' class="org.apache.cxf.jaxb.JAXBDataBinding" scope="prototype"/> -<bean id='AegisDatabindingBean' class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype" /> - - -</beans> +--> +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + <bean id="JaxbDatabindingBean" class="org.apache.cxf.jaxb.JAXBDataBinding" scope="prototype" /> + <bean id="XmlbeansDatabindingBean" class="org.apache.cxf.xmlbeans.XmlBeansDataBinding" scope="prototype" /> + <bean id="SdoDatabindingBean" class="org.apache.cxf.sdo.SDODataBinding" scope="prototype" /> + <bean id="JaxwsServiceBuilderBean" class="org.apache.cxf.jaxws.JaxwsServiceBuilder" scope="prototype" /> + <bean id="SimpleServiceBuilderBean" class="org.apache.cxf.simple.SimpleServiceBuilder" scope="prototype" /> + <bean id="AegisDatabindingBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype" /> +</beans> + Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,141 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> - -  - <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> - <bean id="org.apache.cxf.bus.spring.BusApplicationListener" class="org.apache.cxf.bus.spring.BusApplicationListener"/> - <bean id="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor" class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/> - <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/> - <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/> - - <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl"> - <property name="resolvers"> - <list> - <bean class="org.apache.cxf.resource.ClasspathResolver"/> - <bean class="org.apache.cxf.resource.ClassLoaderResolver"/> -  - <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> - </list> - </property> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.configuration.Configurer" class="org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer"> - <property name="customizer"> - <bean class="org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer"/> - </property> - </bean> - - <bean id="org.apache.cxf.binding.BindingFactoryManager" - class="org.apache.cxf.binding.BindingFactoryManagerImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.transport.DestinationFactoryManager" - class="org.apache.cxf.transport.DestinationFactoryManagerImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.transport.ConduitInitiatorManager" - class="org.apache.cxf.transport.ConduitInitiatorManagerImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.wsdl.WSDLManager" - class="org.apache.cxf.wsdl11.WSDLManagerImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.phase.PhaseManager" - class="org.apache.cxf.phase.PhaseManagerImpl" - lazy-init="true"/> - - <bean id="org.apache.cxf.workqueue.WorkQueueManager" - class="org.apache.cxf.workqueue.WorkQueueManagerImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" - class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.endpoint.ServerRegistry" - class="org.apache.cxf.endpoint.ServerRegistryImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" - class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl" - lazy-init="true"/> - <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" - class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl" - lazy-init="true"/> - - - <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" - class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" - class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - <bean id="org.apache.cxf.headers.HeaderManager" - class="org.apache.cxf.headers.HeaderManagerImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - <bean id="org.apache.cxf.catalog.OASISCatalogManager" - class="org.apache.cxf.catalog.OASISCatalogManager" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - <bean id="org.apache.cxf.service.factory.FactoryBeanListenerManager" - class="org.apache.cxf.service.factory.FactoryBeanListenerManager" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" - class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl" - lazy-init="true"> - <constructor-arg ref="cxf"/> - </bean> -</beans> Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -32,7 +32,25 @@ <generator name="ServiceGenerator" /> </generators> </frontend> + <frontend name="jaxws21" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile"> + <container name="JAXWS21Container" toolspec="jaxws-toolspec.xml" /> + <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor" /> + <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11" /> + <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators"> + <generator name="AntGenerator" /> + <generator name="ClientGenerator" /> + <generator name="FaultGenerator" /> + <generator name="ImplGenerator" /> + <generator name="SEIGenerator" /> + <generator name="ServerGenerator" /> + <generator name="JAXWS21ServiceGenerator" /> + </generators> + </frontend> <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding" /> <databinding name="xmlbeans" package="org.apache.cxf.xmlbeans.tools" profile="XMLBeansToolingDataBinding" /> + <databinding name="jibx" package="org.apache.cxf.jibx.tools" profile="JibxToolingDataBinding" /> + <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" /> + <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" /> + <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" /> </plugin> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -61,7 +61,7 @@ <include>org.jboss.ws:jbossws-spi:jar</include> <include>org.apache.neethi:neethi:jar</include> <include>wsdl4j:wsdl4j:jar</include> - <include>org.apache.ws.commons.schema:XmlSchema:jar</include> + <include>org.apache.ws.xmlschema:xmlschema-core:jar</include> <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>org.apache.ws.security:wss4j:jar</include> <include>org.apache.santuario:xmlsec:jar</include> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -42,7 +42,7 @@ <module name="javax.xml.ws.api" /> <module name="org.apache.neethi" /> <module name="org.apache.velocity" /> - <module name="org.apache.ws.commons.xmlschema" /> + <module name="org.apache.ws.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> <module name="org.springframework.spring" optional="true"/> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<module xmlns="urn:jboss:module:1.0" name="org.apache.ws.xmlschema"> + + <resources> +  + </resources> + + <dependencies> + <module name="javax.api" /> + </dependencies> +</module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -49,7 +49,7 @@ <include name="**/wsdl4j.jar"/> <include name="**/wss4j.jar"/> <include name="**/wstx.jar"/> - <include name="**/XmlSchema.jar"/> + <include name="**/xmlschema-core.jar"/> <include name="**/FastInfoset.jar"/> <include name="**/wstx.jar"/> </patternset> @@ -81,7 +81,7 @@ <include name="**/jbossws-spi.jar"/> <include name="**/jdom.jar"/> <include name="**/neethi.jar"/> - <include name="**/XmlSchema.jar"/> + <include name="**/xmlschema-core.jar"/> <include name="**/xmlsec.jar"/> <include name="**/wsdl4j.jar"/> <include name="**/wss4j.jar"/> @@ -382,9 +382,9 @@ <include name="**/neethi.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/apache/ws/commons/xmlschema/main" flatten="false" overwrite="true"> + <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/XmlSchema.jar"/> + <include name="**/xmlschema-core.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * 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. * @@ -29,12 +29,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.resource.ResourceManager; -import org.apache.cxf.transport.servlet.CXFNonSpringServlet; +import org.apache.cxf.transport.servlet.AbstractHTTPServlet; import org.apache.cxf.transport.servlet.ServletContextResourceResolver; -import org.apache.cxf.transport.servlet.ServletController; -import org.apache.cxf.transport.servlet.ServletTransportFactory; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.ServletDelegate; import org.jboss.wsf.stack.cxf.configuration.BusHolder; @@ -47,19 +46,18 @@ * @since 16-Jun-2010 * */ -public class CXFNonSpringServletExt extends CXFNonSpringServlet implements ServletDelegate +public class CXFNonSpringServletExt extends AbstractHTTPServlet implements ServletDelegate { protected Endpoint endpoint; + protected Bus bus; @Override - public ServletController createServletController(ServletConfig servletConfig) - { - ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory(); - return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus); + public void init(ServletConfig sc) throws ServletException { + super.init(sc); + loadBus(sc); } - @Override - public void loadBus(ServletConfig servletConfig) throws ServletException + protected void loadBus(ServletConfig servletConfig) throws ServletException { //Init the Endpoint endpoint = ServletHelper.initEndpoint(servletConfig, getServletName()); @@ -69,7 +67,6 @@ //register the InstrumentManagementImpl ServletHelper.registerInstrumentManger(bus, getServletContext()); - } private void updateAvailableBusWithServletInfo(ServletConfig servletConfig) @@ -81,17 +78,12 @@ //update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet ResourceManager resourceManager = bus.getExtension(ResourceManager.class); resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext())); - replaceDestinationFactory(); - //set up the ServletController as the CXF servlet would have done - controller = createServletController(servletConfig); - //set the controller in the servlet context now that the bus has been configured in the servlet - servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController()); } @Override protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException { - ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint); + ServletHelper.callRequestHandler(req, res, getServletContext(), bus, endpoint); } @Override Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -21,24 +21,7 @@ */ package org.jboss.wsf.stack.cxf; -import java.io.IOException; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.cxf.BusFactory; -import org.apache.cxf.resource.ResourceManager; -import org.apache.cxf.transport.servlet.CXFServlet; -import org.apache.cxf.transport.servlet.ServletContextResourceResolver; -import org.apache.cxf.transport.servlet.ServletController; -import org.apache.cxf.transport.servlet.ServletTransportFactory; -import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.ServletDelegate; -import org.jboss.wsf.stack.cxf.configuration.BusHolder; -import org.jboss.wsf.stack.cxf.transport.ServletHelper; /** * An extension to the CXF servlet @@ -48,97 +31,7 @@ * * @since 21-Apr-2007 */ -public class CXFServletExt extends CXFServlet implements ServletDelegate +public class CXFServletExt extends CXFNonSpringServletExt implements ServletDelegate { - protected Endpoint endpoint; - @Override - public ServletController createServletController(ServletConfig servletConfig) - { - ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory(); - return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus); - } - - @Override - public void loadBus(ServletConfig servletConfig) throws ServletException - { - //Init the Endpoint - endpoint = ServletHelper.initEndpoint(servletConfig, getServletName()); - - //keep the bus created during deployment and update it with the information coming from the servlet config - updateAvailableBusWithServletInfo(servletConfig); - - //register the InstrumentManagementImpl - ServletHelper.registerInstrumentManger(bus, getServletContext()); - } - - private void updateAvailableBusWithServletInfo(ServletConfig servletConfig) - { - BusHolder holder = endpoint.getService().getDeployment().getAttachment(BusHolder.class); - //set the bus from deployment into the CXF servlet and assign it to the current thread (do not touch the default bus!) - bus = holder.getBus(); - BusFactory.setThreadDefaultBus(bus); - //update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet - ResourceManager resourceManager = bus.getExtension(ResourceManager.class); - resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext())); - replaceDestinationFactory(); - //set up the ServletController as the CXF servlet would have done - controller = createServletController(servletConfig); - //set the controller in the servlet context now that the bus has been configured in the servlet - servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController()); - } - - @Override - protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException - { - ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint); - } - - @Override - public void destroy() - { - ServletHelper.callPreDestroy(endpoint); - } - - @Override - public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context) - throws ServletException, IOException - { - this.doHead(request, response); - } - - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context) - throws ServletException, IOException - { - this.doGet(request, response); - } - - @Override - public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context) - throws ServletException, IOException - { - this.doPost(request, response); - } - - @Override - public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context) - throws ServletException, IOException - { - this.doPut(request, response); - } - - @Override - public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context) - throws ServletException, IOException - { - this.doDelete(request, response); - } - - @Override - public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context) - throws ServletException, IOException - { - this.service(request, response); - } } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * 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. * @@ -24,17 +24,37 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; +import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.cxf.transport.servlet.ServletController; +import org.apache.cxf.Bus; +import org.apache.cxf.BusException; +import org.apache.cxf.frontend.WSDLGetInterceptor; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.DestinationFactory; +import org.apache.cxf.transport.DestinationFactoryManager; +import org.apache.cxf.transport.http.AbstractHTTPDestination; +import org.apache.cxf.transport.http.DestinationRegistry; +import org.apache.cxf.transport.http.HTTPTransportFactory; +import org.apache.cxf.transports.http.QueryHandler; +import org.apache.cxf.transports.http.QueryHandlerRegistry; import org.jboss.util.NotImplementedException; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.invocation.InvocationContext; import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointMetrics; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.stack.cxf.configuration.BusHolder; /** * A request handler @@ -44,17 +64,42 @@ */ public class RequestHandlerImpl implements RequestHandler { + private ServerConfig serverConfig; + RequestHandlerImpl() { + final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); } public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { - ServletControllerExt controller = (ServletControllerExt)context.getAttribute(ServletController.class.getName()); - if (controller == null) - throw new IllegalStateException("Cannot obtain servlet controller"); - - controller.invoke(req, res, ep); + Bus bus = ep.getService().getDeployment().getAttachment(BusHolder.class).getBus(); + AbstractHTTPDestination dest = findDestination(req, bus); + + boolean requestHandled = handleQuery(req, res, dest, bus); + if (false == requestHandled) + { + Long beginTime = initRequestMetrics(ep); + HttpServletResponseExt response = new HttpServletResponseExt(res); + try + { + ServletConfig cfg = (ServletConfig)context.getAttribute(ServletConfig.class.getName()); + dest.invoke(cfg, context, req, response); + } + catch (IOException e) + { + throw new ServletException(e); + } + if (response.getStatus() < 500) + { + processResponseMetrics(ep, beginTime); + } + else + { + processFaultMetrics(ep, beginTime); + } + } } public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) @@ -66,4 +111,140 @@ { throw new NotImplementedException(); } + + /** + * Finds destination based on request URI + * @param requestURI to be recognized + * @return destination associated with the request URI + * @throws ServletException when destination wasn't found + */ + private AbstractHTTPDestination findDestination(HttpServletRequest req, Bus bus) throws ServletException + { + // Find destination based on request URI + String requestURI = req.getRequestURI(); + DestinationRegistry destRegistry = getDestinationRegistryFromBus(bus); + if (destRegistry == null) + { + throw new ServletException("Cannot obtain DestinationRegistry!"); + } + Collection<AbstractHTTPDestination> destinations = destRegistry.getDestinations(); + AbstractHTTPDestination returnValue = null; + for (AbstractHTTPDestination destination : destinations) + { + EndpointInfo endpointInfo = destination.getEndpointInfo(); + String address = endpointInfo.getAddress(); + + String path = address; + try + { + path = new URL(address).getPath(); + } + catch (MalformedURLException ex) + { + // ignore + } + + if (path != null) + { + if (requestURI.equals(path)) + { + return destination; // exact match + } + else if (requestURI.startsWith(path)) + { + returnValue = destination; // fallback + } + } + } + + if (returnValue == null) + throw new ServletException("Cannot obtain destination for: " + requestURI); + + return returnValue; + } + + private static DestinationRegistry getDestinationRegistryFromBus(Bus bus) throws ServletException { + DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class); + try { + DestinationFactory df = dfm + .getDestinationFactory("http://cxf.apache.org/transports/http/configuration"); + if (df instanceof HTTPTransportFactory) { + HTTPTransportFactory transportFactory = (HTTPTransportFactory)df; + return transportFactory.getRegistry(); + } + } catch (BusException e) { + throw new ServletException("Cannot get DestinationFactory for http transport!"); + } + return null; + } + + /** + * When request includes query it tries to lookup the query handler and tries to handle the request message + * @param req request + * @param res response + * @param dest destination + * @return true if there was a query handler that successfully handled the request, false otherwise + * @throws ServletException if some problem occurs + */ + private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, AbstractHTTPDestination dest, Bus bus) + throws ServletException + { + boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0); + boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null; + + if (hasQuery && queryHandlerRegistryExists) + { + String ctxUri = req.getRequestURI(); + String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); + EndpointInfo endpointInfo = dest.getEndpointInfo(); + endpointInfo.setProperty(WSDLGetInterceptor.AUTO_REWRITE_ADDRESS, + ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost())); + + for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) + { + if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo)) + { + res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri)); + try + { + OutputStream out = res.getOutputStream(); + queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out); + out.flush(); + return true; + } + catch (Exception e) + { + throw new ServletException(e); + } + } + } + } + + return false; + } + + private long initRequestMetrics(Endpoint endpoint) + { + long beginTime = 0; + + EndpointMetrics metrics = endpoint.getEndpointMetrics(); + if (metrics != null) + beginTime = metrics.processRequestMessage(); + + return beginTime; + } + + private void processResponseMetrics(Endpoint endpoint, long beginTime) + { + EndpointMetrics metrics = endpoint.getEndpointMetrics(); + if (metrics != null) + metrics.processResponseMessage(beginTime); + } + + private void processFaultMetrics(Endpoint endpoint, long beginTime) + { + EndpointMetrics metrics = endpoint.getEndpointMetrics(); + if (metrics != null) + metrics.processFaultMessage(beginTime); + } } Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,211 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf; - -import java.io.OutputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collection; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.cxf.Bus; -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.servlet.ServletController; -import org.apache.cxf.transport.servlet.ServletDestination; -import org.apache.cxf.transport.servlet.ServletTransportFactory; -import org.apache.cxf.transports.http.QueryHandler; -import org.apache.cxf.transports.http.QueryHandlerRegistry; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.classloading.ClassLoaderProvider; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.EndpointMetrics; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; - -/** - * An extension to the CXF servlet controller - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class ServletControllerExt extends ServletController -{ - private ServletTransportFactory cxfTransport; - private Bus bus; - private ServerConfig serverConfig; - - public ServletControllerExt(ServletTransportFactory cxfTransport, ServletConfig config, ServletContext servletCtx, Bus bus) - { - super(cxfTransport, config, servletCtx, bus); - this.cxfTransport = cxfTransport; - this.bus = bus; - ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); - SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider(); - serverConfig = spiProvider.getSPI(ServerConfigFactory.class, cl).getServerConfig(); - } - - /** - * Finds destination based on request URI - * @param requestURI to be recognized - * @return destination associated with the request URI - * @throws ServletException when destination wasn't found - */ - private ServletDestination findDestination(HttpServletRequest req) throws ServletException - { - // Find destination based on request URI - String requestURI = req.getRequestURI(); - Collection<ServletDestination> destinations = cxfTransport.getDestinations(); - ServletDestination returnValue = null; - for (ServletDestination destination : destinations) - { - EndpointInfo endpointInfo = destination.getEndpointInfo(); - String address = endpointInfo.getAddress(); - - String path = address; - try - { - path = new URL(address).getPath(); - } - catch (MalformedURLException ex) - { - // ignore - } - - if (path != null) - { - if (requestURI.equals(path)) - { - return destination; // exact match - } - else if (requestURI.startsWith(path)) - { - returnValue = destination; // fallback - } - } - } - - if (returnValue == null) - throw new ServletException("Cannot obtain destination for: " + requestURI); - - return returnValue; - } - - /** - * When request includes query it tries to lookup the query handler and tries to handle the request message - * @param req request - * @param res response - * @param dest destination - * @return true if there was a query handler that successfully handled the request, false otherwise - * @throws ServletException if some problem occurs - */ - private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, ServletDestination dest) - throws ServletException - { - boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0); - boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null; - - if (hasQuery && queryHandlerRegistryExists) - { - String ctxUri = req.getRequestURI(); - String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); - EndpointInfo endpointInfo = dest.getEndpointInfo(); - if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost())) - { - endpointInfo.setProperty("autoRewriteSoapAddress", true); - } - - for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) - { - if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo)) - { - res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri)); - try - { - OutputStream out = res.getOutputStream(); - queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out); - out.flush(); - return true; - } - catch (Exception e) - { - throw new ServletException(e); - } - } - } - } - - return false; - } - - public void invoke(HttpServletRequest req, HttpServletResponse res, Endpoint ep) throws ServletException - { - ServletDestination dest = findDestination(req); - boolean requestHandled = handleQuery(req, res, dest); - - if (false == requestHandled) - { - Long beginTime = initRequestMetrics(ep); - HttpServletResponseExt response = new HttpServletResponseExt(res); - invokeDestination(req, response, dest); - if (response.getStatus() < 500) - { - processResponseMetrics(ep, beginTime); - } - else - { - processFaultMetrics(ep, beginTime); - } - } - } - - private long initRequestMetrics(Endpoint endpoint) - { - long beginTime = 0; - - EndpointMetrics metrics = endpoint.getEndpointMetrics(); - if (metrics != null) - beginTime = metrics.processRequestMessage(); - - return beginTime; - } - - private void processResponseMetrics(Endpoint endpoint, long beginTime) - { - EndpointMetrics metrics = endpoint.getEndpointMetrics(); - if (metrics != null) - metrics.processResponseMessage(beginTime); - } - - private void processFaultMetrics(Endpoint endpoint, long beginTime) - { - EndpointMetrics metrics = endpoint.getEndpointMetrics(); - if (metrics != null) - metrics.processFaultMessage(beginTime); - } - -} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerSpringConfigurer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerSpringConfigurer.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/JBossWSServerSpringConfigurer.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.configuration; - -import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer; -import org.springframework.context.ApplicationContext; - -/** - * A JBossWS CXF Configurer (Spring based) to be used on server side - * - * @author alessio.soldano(a)jboss.com - * @author ema(a)redhat.com - * @since 31-Mar-2010 - */ -public class JBossWSServerSpringConfigurer extends JBossWSSpringConfigurer -{ - public JBossWSServerSpringConfigurer(ApplicationContext ctx) - { - setApplicationContext(ctx); - } -} Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -28,13 +28,11 @@ import javax.xml.ws.soap.SOAPBinding; import org.apache.cxf.binding.soap.SoapTransportFactory; -import org.apache.cxf.bus.extension.ExtensionManager; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.resource.ResourceResolver; import org.apache.cxf.service.invoker.Invoker; -import org.apache.cxf.transport.ConduitInitiator; -import org.apache.cxf.transport.DestinationFactory; -import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.apache.cxf.transport.http.HttpDestinationFactory; +import org.apache.cxf.transport.servlet.ServletDestinationFactory; import org.apache.cxf.ws.addressing.WSAddressingFeature; import org.apache.cxf.ws.rm.RMManager; import org.jboss.wsf.spi.binding.BindingCustomization; @@ -66,14 +64,8 @@ super(); this.metadata = metadata; bus = new JBossWSNonSpringBusFactory().createBus(); - //Force servlet transport to prevent CXF from using Jetty or other transports - ExtensionManager em = bus.getExtension(ExtensionManager.class); - em.activateAllByType(ConduitInitiator.class); //need to activate/register all the beans implementing ConduitInitiator so that does not happen later - DestinationFactory factory = new ServletTransportFactory(bus); - for (String s : factory.getTransportIds()) - { - registerTransport(factory, s); - } + //Force servlet transport to prevent CXF from using Jetty / http server or other transports + bus.setExtension(new ServletDestinationFactory(), HttpDestinationFactory.class); } /** Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * 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. * @@ -32,13 +32,14 @@ import org.apache.cxf.bus.spring.BusApplicationContext; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.resource.ResourceResolver; -import org.apache.cxf.transport.DestinationFactory; -import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.apache.cxf.transport.http.HttpDestinationFactory; +import org.apache.cxf.transport.servlet.ServletDestinationFactory; import org.apache.ws.security.WSSConfig; import org.jboss.logging.Logger; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory; +import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.spring.handler.NamespaceHandlerResolver; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; @@ -96,12 +97,8 @@ log.trace("Could not load additional config from location: " + location, e); } } - //Force servlet transport to prevent CXF from using Jetty or other transports - DestinationFactory factory = new ServletTransportFactory(bus); - for (String s : factory.getTransportIds()) - { - registerTransport(factory, s); - } + //Force servlet transport to prevent CXF from using Jetty / http server or other transports + bus.setExtension(new ServletDestinationFactory(), HttpDestinationFactory.class); } /** @@ -160,7 +157,9 @@ customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); customizer.setDeploymentEndpoints(depEndpoints); - JBossWSServerSpringConfigurer serverConfigurer = new JBossWSServerSpringConfigurer(ctx); + Configurer orig = bus.getExtension(Configurer.class); + JBossWSSpringConfigurer serverConfigurer = (orig instanceof JBossWSSpringConfigurer) ? (JBossWSSpringConfigurer)orig : new JBossWSSpringConfigurer(orig); + serverConfigurer.setApplicationContext(ctx); serverConfigurer.setCustomizer(customizer); return serverConfigurer; } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -25,6 +25,7 @@ import java.security.Principal; import java.util.Calendar; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import javax.security.auth.Subject; @@ -69,7 +70,7 @@ public SubjectCreatingInterceptor() { - this(Collections.<String, Object> emptyMap()); + this(new HashMap<String, Object>()); } public SubjectCreatingInterceptor(Map<String, Object> properties) Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser/JaxwsEndpointDefinitionParser.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser/JaxwsEndpointDefinitionParser.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser/JaxwsEndpointDefinitionParser.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -22,9 +22,10 @@ package org.jboss.wsf.stack.cxf.spring.parser; import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor; +import org.apache.cxf.configuration.Configurer; import org.apache.cxf.jaxws.spring.EndpointDefinitionParser; +import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer; import org.jboss.wsf.stack.cxf.deployment.EndpointImpl; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; @@ -63,9 +64,13 @@ { if (getBus() == null) { - Bus bus = BusFactory.getThreadDefaultBus(); - BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx); + Bus bus = BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx); setBus(bus); + Configurer configurer = bus.getExtension(Configurer.class); + if (configurer instanceof JBossWSSpringConfigurer) + { + ((JBossWSSpringConfigurer) configurer).addApplicationContext(ctx); + } } } } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -73,6 +73,7 @@ ServletContext context = servletConfig.getServletContext(); String contextPath = context.getContextPath(); + context.setAttribute(ServletConfig.class.getName(), servletConfig); return initServiceEndpoint(epRegistry, contextPath, servletName); } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * 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. * @@ -24,9 +24,8 @@ import java.util.Iterator; import java.util.List; -import javax.wsdl.Port; - import org.apache.cxf.binding.soap.SoapTransportFactory; +import org.apache.cxf.binding.soap.jms.interceptor.SoapJMSConstants; import org.apache.cxf.binding.soap.model.SoapBindingInfo; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.EndpointInfo; @@ -50,22 +49,22 @@ public class SoapTransportFactoryExt extends SoapTransportFactory { private ServerConfig serverConfig; - - @SuppressWarnings("unchecked") - public EndpointInfo createEndpointInfo(ServiceInfo serviceInfo, BindingInfo b, Port port) + + @Override + public EndpointInfo createEndpointInfo(ServiceInfo serviceInfo, BindingInfo b, List<?> ees) { String transportURI = "http://schemas.xmlsoap.org/wsdl/soap/"; if (b instanceof SoapBindingInfo) { - SoapBindingInfo sbi = (SoapBindingInfo)b; + SoapBindingInfo sbi = (SoapBindingInfo) b; transportURI = sbi.getTransportURI(); } ServerConfig config = getServerConfig(); EndpointInfo info = new AddressRewritingEndpointInfo(serviceInfo, transportURI, config); - if (port != null) + + if (ees != null) { - List ees = port.getExtensibilityElements(); - for (Iterator itr = ees.iterator(); itr.hasNext();) + for (@SuppressWarnings("rawtypes")Iterator itr = ees.iterator(); itr.hasNext();) { Object extensor = itr.next(); @@ -75,6 +74,10 @@ info.addExtensor(sa); info.setAddress(sa.getLocationURI()); + if (isJMSSpecAddress(sa.getLocationURI())) + { + info.setTransportId(SoapJMSConstants.SOAP_JMS_SPECIFICIATION_TRANSPORTID); + } } else { @@ -82,9 +85,15 @@ } } } + return info; } - + + private boolean isJMSSpecAddress(String address) + { + return address != null && address.startsWith("jms:") && !"jms://".equals(address); + } + private ServerConfig getServerConfig() { if (serverConfig == null) Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -21,7 +21,9 @@ */ package org.jboss.test.ws.jaxws.samples.wsse; -import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor; import org.picketbox.config.PicketBoxConfiguration; import org.picketbox.exceptions.ConfigurationStreamNullException; @@ -39,7 +41,7 @@ public CustomSubjectCreatingInterceptor() { - super(Collections.<String, Object> singletonMap("action", "UsernameToken")); + super(getInitMap()); } public void setSecurityConfigFile(String configFilePath) @@ -62,5 +64,10 @@ } } - + private static Map<String, Object> getInitMap() + { + Map<String, Object> map = new HashMap<String, Object>(); + map.put("action", "UsernameToken"); + return map; + } } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * 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. * @@ -33,7 +33,10 @@ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { WSPasswordCallback pc = (WSPasswordCallback)callbacks[0]; - if (!("kermit".equals(pc.getIdentifier()) && "thefrog".equals(pc.getPassword()))) - throw new SecurityException("User '" + pc.getIdentifier() + "' with password '" + pc.getPassword() + "' not allowed."); + //this CallbackHandler is meant for use with WSS4J 1.6, see http://ws.apache.org/wss4j/wss4j16.html + if ("kermit".equals(pc.getIdentifier())) + { + pc.setPassword("thefrog"); + } } } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -60,7 +60,7 @@ </category> <category name="org.apache.cxf"> - <priority value="DEBUG"/> + <priority value="INFO"/> </category> <category name="org.springframework"> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/GZIPEnforcingInInterceptor.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -28,7 +28,7 @@ import org.apache.cxf.helpers.HttpHeaderHelper; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Message; -import org.apache.cxf.transport.http.gzip.GZIPInInterceptor; +import org.apache.cxf.transport.common.gzip.GZIPInInterceptor; public class GZIPEnforcingInInterceptor extends GZIPInInterceptor { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -31,9 +31,9 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; +import org.apache.cxf.transport.common.gzip.GZIPFeature; +import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor; import org.apache.cxf.transport.http.HTTPConduit; -import org.apache.cxf.transport.http.gzip.GZIPFeature; -import org.apache.cxf.transport.http.gzip.GZIPOutInterceptor; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; import org.jboss.wsf.test.ClientHelper; Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2011-04-28 10:57:21 UTC (rev 14209) @@ -49,6 +49,11 @@ public void handleMessage(Message message) throws Fault { + String method = (String)message.get(Message.HTTP_REQUEST_METHOD); + if (!method.equals("POST")) + { + return; + } StringBuilder sb = new StringBuilder(); InputStream is = message.getContent(InputStream.class); if (is != null) Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-04-27 13:09:15 UTC (rev 14208) +++ stack/cxf/trunk/pom.xml 2011-04-28 10:57:21 UTC (rev 14209) @@ -57,7 +57,7 @@ -->  <jboss700.version>7.0.0.Beta4-SNAPSHOT</jboss700.version> - <cxf.version>2.3.4</cxf.version> + <cxf.version>2.4.1-SNAPSHOT</cxf.version> <cxf.asm.version>3.3</cxf.asm.version> <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version> @@ -81,12 +81,13 @@ <commons.logging.version>1.1.1</commons.logging.version> <log4j.version>1.2.14</log4j.version> <mail.version>1.4.2</mail.version> + <neethi.version>3.0.0</neethi.version> <saaj.api.version>1.0.0.Final</saaj.api.version> <stax.api.version>1.0-2</stax.api.version> <jms.api.version>1.0.0.Final</jms.api.version> <velocity.version>1.5</velocity.version> <xerces.version>2.9.1</xerces.version> - <xmlsec.version>1.4.3</xmlsec.version> + <xmlsec.version>1.4.4</xmlsec.version> <wstx.version>3.2.9</wstx.version> <spring.version>3.0.5.RELEASE</spring.version> </properties> @@ -176,6 +177,10 @@ <groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1102,6 +1107,17 @@ <version>${mail.version}</version> </dependency> <dependency> + <groupId>org.apache.neethi</groupId> + <artifactId>neethi</artifactId> + <version>${neethi.version}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.xml.bind</groupId> <artifactId>jboss-jaxb-api_2.2_spec</artifactId> <version>${jaxb.api.version}</version>

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14208 - in stack/cxf: tags and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-27 09:09:15 -0400 (Wed, 27 Apr 2011) New Revision: 14208 Added: stack/cxf/tags/jbossws-cxf-4.0.0.Alpha5/ Removed: stack/cxf/branches/cxf24/ Log: Tagging jbossws-cxf-4.0.0.Alpha5

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14207 - in stack/cxf/branches/cxf24: modules/addons and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-27 09:07:17 -0400 (Wed, 27 Apr 2011) New Revision: 14207 Modified: stack/cxf/branches/cxf24/modules/addons/pom.xml stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/pom.xml stack/cxf/branches/cxf24/modules/client/pom.xml stack/cxf/branches/cxf24/modules/dist/management/pom.xml stack/cxf/branches/cxf24/modules/dist/pom.xml stack/cxf/branches/cxf24/modules/endorsed/pom.xml stack/cxf/branches/cxf24/modules/resources/pom.xml stack/cxf/branches/cxf24/modules/server/pom.xml stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/cxf24/modules/testsuite/pom.xml stack/cxf/branches/cxf24/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/cxf24/pom.xml Log: Preparing for tagging Modified: stack/cxf/branches/cxf24/modules/addons/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/addons/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/addons/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/client/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/client/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/client/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/dist/management/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/dist/management/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/dist/management/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../../pom.xml</relativePath> </parent>  Modified: stack/cxf/branches/cxf24/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/dist/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/dist/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -4,12 +4,12 @@ <name>JBoss Web Services - Stack CXF Distrubiton</name> <artifactId>jbossws-cxf-dist</artifactId> <packaging>pom</packaging> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/endorsed/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/endorsed/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/endorsed/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/resources/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/resources/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/server/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/server/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/server/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/testsuite/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/testsuite/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/cxf24/modules/testsuite/shared-tests/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/modules/testsuite/shared-tests/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/cxf24/pom.xml =================================================================== --- stack/cxf/branches/cxf24/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) +++ stack/cxf/branches/cxf24/pom.xml 2011-04-27 13:07:17 UTC (rev 14207) @@ -18,20 +18,20 @@ <packaging>pom</packaging> <description>JBossWS CXF stack</description> - <version>4.0.0.Alpha5-SNAPSHOT</version> + <version>4.0.0.Alpha5</version>  <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>1.0.10.Alpha1</version> </parent>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.0.0...</url> </scm>  @@ -57,7 +57,7 @@ -->  <jboss700.version>7.0.0.Beta4-SNAPSHOT</jboss700.version> - <cxf.version>2.4.1-SNAPSHOT</cxf.version> + <cxf.version>2.4.0</cxf.version> <cxf.asm.version>3.3</cxf.asm.version> <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version> <fastinfoset.api.version>1.2.7</fastinfoset.api.version>

13 years, 8 months

1
0
0 / 0

JBossWS SVN: r14206 - in stack/cxf/branches/cxf24: modules/resources/src/main/resources/modules/org/apache/ws and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-04-27 05:33:35 -0400 (Wed, 27 Apr 2011) New Revision: 14206 Removed: stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/commons/ Modified: stack/cxf/branches/cxf24/pom.xml Log: Modified: stack/cxf/branches/cxf24/pom.xml =================================================================== --- stack/cxf/branches/cxf24/pom.xml 2011-04-27 08:46:09 UTC (rev 14205) +++ stack/cxf/branches/cxf24/pom.xml 2011-04-27 09:33:35 UTC (rev 14206) @@ -45,11 +45,11 @@  <properties> - <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version> - <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version> - <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version> + <jbossws.spi.version>2.0.0.Alpha3</jbossws.spi.version> + <jbossws.common.version>2.0.0.Alpha8</jbossws.common.version> + <jbossws.common.tools.version>1.0.0.Alpha1</jbossws.common.tools.version> + <jbossws.shared.testsuite.version>4.0.0.Alpha2</jbossws.shared.testsuite.version> + <jbossws.jboss600.version>4.0.0.Alpha1</jbossws.jboss600.version>   <!--

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2011