Author: alessio.soldano(a)jboss.com Date: 2010-08-04 09:52:11 -0400 (Wed, 04 Aug 2010) New Revision: 12732 Added: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl Removed: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl Modified: stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss501.txt stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss510.txt stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss600.txt stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss601.txt Log: svn merge -r 12705:12730 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk . Modified: stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-04 13:44:58 UTC (rev 12731) +++ stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -25,13 +25,38 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; +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.ConfiguredBeanLocator; 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; /** * @@ -41,7 +66,7 @@ */ public class JBossWSNonSpringBusFactory extends CXFBusFactory { - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") @Override public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties) { if (extensions == null) @@ -54,13 +79,81 @@ } extensions.put(ConfiguredBeanLocator.class, new DummyBeanLocator()); + + preparePolicyEngine(extensions); + + Bus bus = new ExtensionManagerBus(extensions, properties); - Bus bus = new ExtensionManagerBus(extensions, properties); + initPolicyEngine((PolicyEngineImpl)extensions.get(PolicyEngine.class), bus); + possiblySetDefaultBus(bus); initializeBus(bus); 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.setExtension(assertionBuilderRegistry, AssertionBuilderRegistry.class); + PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl(); + bus.setExtension(policyInterceptorProviderRegistry, PolicyInterceptorProviderRegistry.class); + 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.initialise(); +// rmManager.registerListeners(); + rmManager.setBus(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/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-04 13:44:58 UTC (rev 12731) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.stack.cxf.configuration; +import java.util.LinkedList; import java.util.List; import javax.xml.ws.soap.SOAPBinding; @@ -33,6 +34,7 @@ import org.apache.cxf.transport.ConduitInitiator; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.apache.cxf.ws.rm.RMManager; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBusFactory; @@ -55,6 +57,7 @@ private boolean configured = false; protected DDBeans metadata; + protected List<EndpointImpl> endpoints = new LinkedList<EndpointImpl>(); public NonSpringBusHolder(DDBeans metadata) { @@ -98,15 +101,34 @@ endpoint.setServiceName(dde.getServiceName()); endpoint.setWsdlLocation(dde.getWsdlLocation()); endpoint.publish(); + endpoints.add(endpoint); if (dde.isMtomEnabled()) { SOAPBinding binding = (SOAPBinding) endpoint.getBinding(); binding.setMTOMEnabled(true); } - //TODO!! We need to stop the endpoint on undeployment } configured = true; } + + @Override + public void close() + { + //Move this stuff to the bus (our own impl)? + RMManager rmManager = bus.getExtension(RMManager.class); + if (rmManager != null) + { + rmManager.shutdown(); + } + + for (EndpointImpl endpoint : endpoints) + { + endpoint.stop(); + } + endpoints.clear(); + bus.shutdown(true); + super.close(); + } private static Object newInstance(String className) { Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-08-04 13:44:58 UTC (rev 12731) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-08-04 13:52:11 UTC (rev 12732) @@ -83,6 +83,18 @@ prefix="WEB-INF/wsdl"/> </war> + <!-- jaxws-samples-wsrm --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-api.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> + </classes> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + <!-- Please add alphabetically --> </target> Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm) Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,68 +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.test.ws.jaxws.samples.wsrm.client; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Client invoking web service with WS-RM and using no xml descriptor - * - * @author alessio.soldano(a)jboss.com - * @since 02-Aug-2010 - * - */ -public final class WSReliableMessagingWithAPITestCase extends JBossWSTest -{ - private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm-api/SimpleService"; - private SimpleService proxy; - - public static Test suite() - { - return new JBossWSTestSetup(WSReliableMessagingWithAPITestCase.class, "jaxws-samples-wsrm-api.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleService"); - URL wsdlURL = new URL(serviceURL + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - proxy = (SimpleService)service.getPort(SimpleService.class); - } - - public void test() throws Exception - { - proxy.ping(); // one way call - assertEquals("Hello World!", proxy.echo("Hello World!")); // request response call - } - -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsrm.client; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Client invoking web service with WS-RM and using no xml descriptor + * + * @author alessio.soldano(a)jboss.com + * @since 02-Aug-2010 + * + */ +public final class WSReliableMessagingWithAPITestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm-api/SimpleService"; + private SimpleService proxy; + + public static Test suite() + { + return new JBossWSTestSetup(WSReliableMessagingWithAPITestCase.class, "jaxws-samples-wsrm-api.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + proxy = (SimpleService)service.getPort(SimpleService.class); + } + + public void test() throws Exception + { + proxy.ping(); // one way call + assertEquals("Hello World!", proxy.echo("Hello World!")); // request response call + } + +} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,62 +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.test.ws.jaxws.samples.wsrm.generated; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -/** - * <p>Java class for echo complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="echo"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "echo", propOrder = { "arg0" }) -public class Echo -{ - - protected String arg0; - - public String getArg0() - { - return arg0; - } - - public void setArg0(String value) - { - this.arg0 = value; - } - -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,62 @@ +/* + * 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.wsrm.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + * <p>Java class for echo complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="echo"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echo", propOrder = { "arg0" }) +public class Echo +{ + + protected String arg0; + + public String getArg0() + { + return arg0; + } + + public void setArg0(String value) + { + this.arg0 = value; + } + +} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,64 +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.test.ws.jaxws.samples.wsrm.generated; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - * <p>Java class for echoResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="echoResponse"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "echoResponse", propOrder = { "_return" }) -public class EchoResponse -{ - - @XmlElement(name = "return") - protected String _return; - - public String getReturn() - { - return _return; - } - - public void setReturn(String value) - { - this._return = value; - } - -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,64 @@ +/* + * 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.wsrm.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + * <p>Java class for echoResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="echoResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echoResponse", propOrder = { "_return" }) +public class EchoResponse +{ + + @XmlElement(name = "return") + protected String _return; + + public String getReturn() + { + return _return; + } + + public void setReturn(String value) + { + this._return = value; + } + +} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,108 +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.test.ws.jaxws.samples.wsrm.generated; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.jboss.test.ws.jaxws.samples.wsrm.generated package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _EchoResponse_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "echoResponse"); - private final static QName _Echo_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "echo"); - private final static QName _Ping_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "ping"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.wsrm.generated - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Ping } - * - */ - public Ping createPing() { - return new Ping(); - } - - /** - * Create an instance of {@link Echo } - * - */ - public Echo createEcho() { - return new Echo(); - } - - /** - * Create an instance of {@link EchoResponse } - * - */ - public EchoResponse createEchoResponse() { - return new EchoResponse(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echoResponse") - public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) { - return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echo") - public JAXBElement<Echo> createEcho(Echo value) { - return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "ping") - public JAXBElement<Ping> createPing(Ping value) { - return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value); - } - -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,108 @@ +/* + * 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.wsrm.generated; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.samples.wsrm.generated package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _EchoResponse_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "echoResponse"); + private final static QName _Echo_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "echo"); + private final static QName _Ping_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "ping"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.wsrm.generated + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link Ping } + * + */ + public Ping createPing() { + return new Ping(); + } + + /** + * Create an instance of {@link Echo } + * + */ + public Echo createEcho() { + return new Echo(); + } + + /** + * Create an instance of {@link EchoResponse } + * + */ + public EchoResponse createEchoResponse() { + return new EchoResponse(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echoResponse") + public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) { + return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echo") + public JAXBElement<Echo> createEcho(Echo value) { + return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "ping") + public JAXBElement<Ping> createPing(Ping value) { + return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value); + } + +} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,46 +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.test.ws.jaxws.samples.wsrm.generated; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -/** - * <p>Java class for ping complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * &lt;complexType name="ping"> - * &lt;complexContent> - * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;sequence> - * &lt;/sequence> - * &lt;/restriction> - * &lt;/complexContent> - * &lt;/complexType> - * </pre> - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ping") -public class Ping {} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,46 @@ +/* + * 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.wsrm.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + * <p>Java class for ping complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="ping"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ping") +public class Ping {} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,52 +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.test.ws.jaxws.samples.wsrm.generated; - -import javax.jws.Oneway; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - -/** - * This class was generated by Apache CXF (incubator) 2.0.5-incubator - * Wed Apr 16 14:19:06 CEST 2008 - * Generated source version: 2.0.5-incubator - */ -@WebService(targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "SimpleService") -public interface SimpleService -{ - - @Oneway - @RequestWrapper(localName = "ping", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Ping") - @WebMethod - public void ping(); - - @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.EchoResponse") - @RequestWrapper(localName = "echo", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Echo") - @WebResult(name = "return", targetNamespace = "") - @WebMethod - public java.lang.String echo(@WebParam(name = "arg0", targetNamespace = "") java.lang.String arg0); - -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,52 @@ +/* + * 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.wsrm.generated; + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF (incubator) 2.0.5-incubator + * Wed Apr 16 14:19:06 CEST 2008 + * Generated source version: 2.0.5-incubator + */ +@WebService(targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "SimpleService") +public interface SimpleService +{ + + @Oneway + @RequestWrapper(localName = "ping", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Ping") + @WebMethod + public void ping(); + + @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.EchoResponse") + @RequestWrapper(localName = "echo", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Echo") + @WebResult(name = "return", targetNamespace = "") + @WebMethod + public java.lang.String echo(@WebParam(name = "arg0", targetNamespace = "") java.lang.String arg0); + +} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,84 +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.test.ws.jaxws.samples.wsrm.generated; - -import java.net.MalformedURLException; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; - -/** - * This class was generated by Apache CXF (incubator) 2.0.5-incubator - * Wed Apr 16 14:19:06 CEST 2008 - * Generated source version: 2.0.5-incubator - */ -@WebServiceClient -( - name = "SimpleService", - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", - wsdlLocation = "file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl" -) -public class SimpleService_Service extends Service { - - public final static URL WSDL_LOCATION; - public final static QName SERVICE = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleService"); - public final static QName SimpleServicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleServicePort"); - static - { - URL url = null; - try - { - url = new URL("file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl"); - } - catch (MalformedURLException e) - { - System.err.println("Can not initialize the default wsdl from file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl"); - // e.printStackTrace(); - } - WSDL_LOCATION = url; - } - - public SimpleService_Service(URL wsdlLocation) - { - super(wsdlLocation, SERVICE); - } - - public SimpleService_Service(URL wsdlLocation, QName serviceName) - { - super(wsdlLocation, serviceName); - } - - public SimpleService_Service() - { - super(WSDL_LOCATION, SERVICE); - } - - @WebEndpoint(name = "SimpleServicePort") - public SimpleService getSimpleServicePort() - { - return super.getPort(SimpleServicePort, SimpleService.class); - } - -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,84 @@ +/* + * 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.wsrm.generated; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; + +/** + * This class was generated by Apache CXF (incubator) 2.0.5-incubator + * Wed Apr 16 14:19:06 CEST 2008 + * Generated source version: 2.0.5-incubator + */ +@WebServiceClient +( + name = "SimpleService", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", + wsdlLocation = "file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl" +) +public class SimpleService_Service extends Service { + + public final static URL WSDL_LOCATION; + public final static QName SERVICE = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleService"); + public final static QName SimpleServicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm";, "SimpleServicePort"); + static + { + URL url = null; + try + { + url = new URL("file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl"); + } + catch (MalformedURLException e) + { + System.err.println("Can not initialize the default wsdl from file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl"); + // e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public SimpleService_Service(URL wsdlLocation) + { + super(wsdlLocation, SERVICE); + } + + public SimpleService_Service(URL wsdlLocation, QName serviceName) + { + super(wsdlLocation, serviceName); + } + + public SimpleService_Service() + { + super(WSDL_LOCATION, SERVICE); + } + + @WebEndpoint(name = "SimpleServicePort") + public SimpleService getSimpleServicePort() + { + return super.getPort(SimpleServicePort, SimpleService.class); + } + +} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,23 +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. - */ -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -package org.jboss.test.ws.jaxws.samples.wsrm.generated; Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,23 @@ +/* + * 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. + */ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +package org.jboss.test.ws.jaxws.samples.wsrm.generated; Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service) Deleted: stack/cxf/branches/cxf-2.3/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 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,78 +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.test.ws.jaxws.samples.wsrm.service; - -import java.io.IOException; -import java.io.InputStream; - -import org.apache.cxf.helpers.IOUtils; -import org.apache.cxf.interceptor.Fault; -import org.apache.cxf.io.CachedOutputStream; -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.AbstractPhaseInterceptor; -import org.apache.cxf.phase.Phase; - -/** - * A server side interceptor that verifies every incoming message has WS-RM stuff - * (meaning the client successfully understood server's policy enforcing ws-rm) - * - * @author alessio.soldano(a)jboss.com - * @since 02-Aug-2010 - */ -public class RMCheckInterceptor extends AbstractPhaseInterceptor<Message> -{ - private static final String RM_NS = "http://schemas.xmlsoap.org/ws/2005/02/rm"; - - public RMCheckInterceptor() - { - super(Phase.RECEIVE); - } - - public void handleMessage(Message message) throws Fault - { - StringBuilder sb = new StringBuilder(); - InputStream is = message.getContent(InputStream.class); - if (is != null) - { - CachedOutputStream bos = new CachedOutputStream(); - try - { - IOUtils.copy(is, bos); - bos.flush(); - is.close(); - message.setContent(InputStream.class, bos.getInputStream()); - bos.writeCacheTo(sb); - bos.close(); - } - catch (IOException e) - { - throw new Fault(e); - } - } - if (!sb.toString().contains(RM_NS)) - { - throw new Fault("Could not find any reference to namespace '" + RM_NS + "' in handled message.", - java.util.logging.Logger.getLogger(RMCheckInterceptor.class.getName())); - } - } - -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/RMCheckInterceptor.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsrm.service; + +import java.io.IOException; +import java.io.InputStream; + +import org.apache.cxf.helpers.IOUtils; +import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.io.CachedOutputStream; +import org.apache.cxf.message.Message; +import org.apache.cxf.phase.AbstractPhaseInterceptor; +import org.apache.cxf.phase.Phase; + +/** + * A server side interceptor that verifies every incoming message has WS-RM stuff + * (meaning the client successfully understood server's policy enforcing ws-rm) + * + * @author alessio.soldano(a)jboss.com + * @since 02-Aug-2010 + */ +public class RMCheckInterceptor extends AbstractPhaseInterceptor<Message> +{ + private static final String RM_NS = "http://schemas.xmlsoap.org/ws/2005/02/rm"; + + public RMCheckInterceptor() + { + super(Phase.RECEIVE); + } + + public void handleMessage(Message message) throws Fault + { + StringBuilder sb = new StringBuilder(); + InputStream is = message.getContent(InputStream.class); + if (is != null) + { + CachedOutputStream bos = new CachedOutputStream(); + try + { + IOUtils.copy(is, bos); + bos.flush(); + is.close(); + message.setContent(InputStream.class, bos.getInputStream()); + bos.writeCacheTo(sb); + bos.close(); + } + catch (IOException e) + { + throw new Fault(e); + } + } + if (!sb.toString().contains(RM_NS)) + { + throw new Fault("Could not find any reference to namespace '" + RM_NS + "' in handled message.", + java.util.logging.Logger.getLogger(RMCheckInterceptor.class.getName())); + } + } + +} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,53 +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.test.ws.jaxws.samples.wsrm.service; - -import javax.jws.Oneway; -import javax.jws.WebMethod; -import javax.jws.WebService; - -import org.apache.cxf.interceptor.InInterceptors; - -@WebService -( - name = "SimpleService", - serviceName = "SimpleService", - wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl", - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm" -) -(a)InInterceptors(interceptors=&quot;org.jboss.test.ws.jaxws.samples.wsrm.service.RMCheckInterceptor&quot;) -public class SimpleServiceImpl -{ - @Oneway - @WebMethod - public void ping() - { - System.out.println("ping()"); - } - - @WebMethod - public String echo(String s) - { - System.out.println("echo(" + s + ")"); - return s; - } -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,53 @@ +/* + * 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.wsrm.service; + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebService; + +import org.apache.cxf.interceptor.InInterceptors; + +@WebService +( + name = "SimpleService", + serviceName = "SimpleService", + wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm" +) +(a)InInterceptors(interceptors=&quot;org.jboss.test.ws.jaxws.samples.wsrm.service.RMCheckInterceptor&quot;) +public class SimpleServiceImpl +{ + @Oneway + @WebMethod + public void ping() + { + System.out.println("ping()"); + } + + @WebMethod + public String echo(String s) + { + System.out.println("echo(" + s + ")"); + return s; + } +} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,55 +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.test.ws.jaxws.samples.wsrm.service.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; - -/** - * This class was generated by the CXF 2.0.5-incubator - * Wed Apr 16 13:57:06 CEST 2008 - * Generated source version: 2.0.5-incubator - */ -@XmlRootElement(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -public class Echo -{ - - @XmlElement(name = "arg0") - private java.lang.String arg0; - - public java.lang.String getArg0() - { - return this.arg0; - } - - public void setArg0( java.lang.String newArg0 ) - { - this.arg0 = newArg0; - } - -} - Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,55 @@ +/* + * 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.wsrm.service.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; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Wed Apr 16 13:57:06 CEST 2008 + * Generated source version: 2.0.5-incubator + */ +@XmlRootElement(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +public class Echo +{ + + @XmlElement(name = "arg0") + private java.lang.String arg0; + + public java.lang.String getArg0() + { + return this.arg0; + } + + public void setArg0( java.lang.String newArg0 ) + { + this.arg0 = newArg0; + } + +} + Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,55 +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.test.ws.jaxws.samples.wsrm.service.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; - -/** - * This class was generated by the CXF 2.0.5-incubator - * Wed Apr 16 13:57:06 CEST 2008 - * Generated source version: 2.0.5-incubator - */ -@XmlRootElement(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -public class EchoResponse -{ - - @XmlElement(name = "return") - private java.lang.String _return; - - public java.lang.String get_return() - { - return this._return; - } - - public void set_return( java.lang.String new_return ) - { - this._return = new_return; - } - -} - Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,55 @@ +/* + * 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.wsrm.service.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; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Wed Apr 16 13:57:06 CEST 2008 + * Generated source version: 2.0.5-incubator + */ +@XmlRootElement(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +public class EchoResponse +{ + + @XmlElement(name = "return") + private java.lang.String _return; + + public java.lang.String get_return() + { + return this._return; + } + + public void set_return( java.lang.String new_return ) + { + this._return = new_return; + } + +} + Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,37 +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.test.ws.jaxws.samples.wsrm.service.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; - -/** - * This class was generated by the CXF 2.0.5-incubator - * Wed Apr 16 13:57:06 CEST 2008 - * Generated source version: 2.0.5-incubator - */ -@XmlRootElement(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -public class Ping {} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,37 @@ +/* + * 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.wsrm.service.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; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Wed Apr 16 13:57:06 CEST 2008 + * Generated source version: 2.0.5-incubator + */ +@XmlRootElement(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +public class Ping {} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm) Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,15 +0,0 @@ -<?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>SimpleService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>SimpleService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2010-08-04 13:52:11 UTC (rev 12732) @@ -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>SimpleService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>SimpleService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2010-08-04 13:33:47 UTC (rev 12730) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2010-08-04 13:52:11 UTC (rev 12732) @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="SimpleService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"> - - <wsdl:types> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm&quo... -<xsd:element name="ping" type="tns:ping"/> -<xsd:complexType name="ping"> -<xsd:sequence/> -</xsd:complexType> -<xsd:element name="echo" type="tns:echo"/> -<xsd:complexType name="echo"> -<xsd:sequence> -<xsd:element minOccurs="0" name="arg0" type="xsd:string"/> -</xsd:sequence> -</xsd:complexType> -<xsd:element name="echoResponse" type="tns:echoResponse"/> -<xsd:complexType name="echoResponse"> -<xsd:sequence> -<xsd:element minOccurs="0" name="return" type="xsd:string"/> -</xsd:sequence> -</xsd:complexType> -</xsd:schema> - </wsdl:types> - <wsdl:message name="echoResponse"> - <wsdl:part name="parameters" element="tns:echoResponse"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="echo"> - <wsdl:part name="parameters" element="tns:echo"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="ping"> - <wsdl:part name="parameters" element="tns:ping"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="SimpleService"> - <wsdl:operation name="ping"> - <wsdl:input name="ping" message="tns:ping"> - </wsdl:input> - </wsdl:operation> - <wsdl:operation name="echo"> - <wsdl:input name="echo" message="tns:echo"> - </wsdl:input> - <wsdl:output name="echoResponse" message="tns:echoResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SimpleServiceSoapBinding" type="tns:SimpleService"> - <wsp:Policy> - <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> - </wsp:Policy> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="ping"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="ping"> - <soap:body use="literal"/> - </wsdl:input> - </wsdl:operation> - <wsdl:operation name="echo"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="echo"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="echoResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SimpleService"> - <wsdl:port name="SimpleServicePort" binding="tns:SimpleServiceSoapBinding"> - <soap:address location="http://localhost:9090/hello"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl (from rev 12730, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2010-08-04 13:52:11 UTC (rev 12732) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="SimpleService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"> + + <wsdl:types> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm&quo... +<xsd:element name="ping" type="tns:ping"/> +<xsd:complexType name="ping"> +<xsd:sequence/> +</xsd:complexType> +<xsd:element name="echo" type="tns:echo"/> +<xsd:complexType name="echo"> +<xsd:sequence> +<xsd:element minOccurs="0" name="arg0" type="xsd:string"/> +</xsd:sequence> +</xsd:complexType> +<xsd:element name="echoResponse" type="tns:echoResponse"/> +<xsd:complexType name="echoResponse"> +<xsd:sequence> +<xsd:element minOccurs="0" name="return" type="xsd:string"/> +</xsd:sequence> +</xsd:complexType> +</xsd:schema> + </wsdl:types> + <wsdl:message name="echoResponse"> + <wsdl:part name="parameters" element="tns:echoResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echo"> + <wsdl:part name="parameters" element="tns:echo"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="ping"> + <wsdl:part name="parameters" element="tns:ping"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SimpleService"> + <wsdl:operation name="ping"> + <wsdl:input name="ping" message="tns:ping"> + </wsdl:input> + </wsdl:operation> + <wsdl:operation name="echo"> + <wsdl:input name="echo" message="tns:echo"> + </wsdl:input> + <wsdl:output name="echoResponse" message="tns:echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SimpleServiceSoapBinding" type="tns:SimpleService"> + <wsp:Policy> + <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> + </wsp:Policy> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="ping"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="ping"> + <soap:body use="literal"/> + </wsdl:input> + </wsdl:operation> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="echo"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SimpleService"> + <wsdl:port name="SimpleServicePort" binding="tns:SimpleServiceSoapBinding"> + <soap:address location="http://localhost:9090/hello"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss501.txt 2010-08-04 13:44:58 UTC (rev 12731) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss501.txt 2010-08-04 13:52:11 UTC (rev 12732) @@ -55,6 +55,9 @@ # [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available on AS 5.x org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* +# [JBWS-3075][CXF-2912] EndpointPolicy is not ignoring empty Policies in its updatePolicy() method +org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.* + # [JBWS-3086] This have been merged to AS 600M3 and upstream only org/jboss/test/ws/jaxws/samples/jmsendpoints/** Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss510.txt 2010-08-04 13:44:58 UTC (rev 12731) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss510.txt 2010-08-04 13:52:11 UTC (rev 12732) @@ -55,6 +55,9 @@ # [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available on AS 5.x org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* +# [JBWS-3075][CXF-2912] EndpointPolicy is not ignoring empty Policies in its updatePolicy() method +org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.* + # [JBWS-3086] This have been merged to AS 600M3 and upstream only org/jboss/test/ws/jaxws/samples/jmsendpoints/** Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss600.txt 2010-08-04 13:44:58 UTC (rev 12731) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss600.txt 2010-08-04 13:52:11 UTC (rev 12732) @@ -46,3 +46,5 @@ # [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints org/jboss/test/ws/jaxws/jbws2268/** +# [JBWS-3075][CXF-2912] EndpointPolicy is not ignoring empty Policies in its updatePolicy() method +org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.* Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss601.txt 2010-08-04 13:44:58 UTC (rev 12731) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss601.txt 2010-08-04 13:52:11 UTC (rev 12732) @@ -46,6 +46,9 @@ # [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints org/jboss/test/ws/jaxws/jbws2268/** +# [JBWS-3075][CXF-2912] EndpointPolicy is not ignoring empty Policies in its updatePolicy() method +org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase.* + # [JBWS-3086] TODO: merge to AS IL trunk once SPI, COMMON and FRAMEWORK are updated there org/jboss/test/ws/jaxws/samples/jmsendpoints/**