[jbossws-commits] JBossWS SVN: r12790 - in stack/cxf/branches/cxf-2.3/modules: server/src/main/java/org/jboss/wsf/stack/cxf and 15 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-08-13 03:08:06 -0400 (Fri, 13 Aug 2010) New Revision: 12790 Added: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHelloResponse.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/web.xml stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl Removed: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHelloResponse.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/web.xml stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.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/CXFNonSpringServletExt.java stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 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 12772:12776 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-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -24,8 +24,8 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.LinkedList; +import java.util.List; import java.util.Map; import javax.xml.bind.JAXBException; @@ -125,9 +125,7 @@ //RM RMManager rmManager = new RMManager(); -// rmManager.initialise(); -// rmManager.registerListeners(); - rmManager.setBus(bus); + rmManager.init(bus); //RM Policy policyInterceptorProviderRegistry.register(new RMPolicyInterceptorProvider(bus)); Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -88,4 +88,10 @@ { ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint); } + + @Override + public void destroy() + { + ServletHelper.callPreDestroy(endpoint); + } } Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -87,5 +87,12 @@ { ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint); } + + @Override + public void destroy() + { + ServletHelper.callPreDestroy(endpoint); + } + } Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -58,6 +58,7 @@ @Override protected void doPublish(String addr) { + super.getServerFactory().setBlockPostConstruct(true); super.doPublish(addr); //allow for configuration so that the wsdlPublisher can be set be the JBossWSCXFConfigurer configureObject(this); Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -132,6 +132,19 @@ } } } + + public static void callPreDestroy(Endpoint endpoint) + { + ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class); + if (factory != null) + { + if (DeploymentType.JAXWS_EJB3 != endpoint.getService().getDeployment().getType() + && factory.getServiceBean() != null) + { + InjectionHelper.callPreDestroyMethod(factory.getServiceBean()); + } + } + } public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res, ServletContext ctx, Bus bus, Endpoint endpoint) throws ServletException Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-08-13 07:08:06 UTC (rev 12790) @@ -96,9 +96,6 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/AsymmetricBindingClientTestCase.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -31,9 +31,9 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.logging.Logger; import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService; +import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -94,7 +94,7 @@ private void loadBus(String scenario) throws Exception { log.info("Loading bus for " + scenario + "..."); - SpringBusFactory busFactory = new SpringBusFactory(); + JBossWSSpringBusFactory busFactory = new JBossWSSpringBusFactory(); URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml"); bus = busFactory.createBus(cxfConfig); BusFactory.setDefaultBus(bus); Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/interop/wstrust10/SymmetricBindingClientTestCase.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -31,9 +31,9 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; import org.jboss.logging.Logger; import org.jboss.test.ws.jaxws.cxf.interop.wstrust10.interopbaseaddress.interop.IPingService; +import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -110,7 +110,7 @@ private void loadBus(String scenario) throws Exception { log.info("Loading bus for " + scenario + "..."); - SpringBusFactory busFactory = new SpringBusFactory(); + JBossWSSpringBusFactory busFactory = new JBossWSSpringBusFactory(); URL cxfConfig = getResourceURL("jaxws/cxf/interop/wstrust10/META-INF/" + scenario + "-client-config.xml"); bus = busFactory.createBus(cxfConfig); BusFactory.setDefaultBus(bus); Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2010-08-13 07:08:06 UTC (rev 12790) @@ -1,36 +0,0 @@ -<beans - xmlns='http://www.springframework.org/schema/beans' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xmlns:beans='http://www.springframework.org/schema/beans' - xmlns:jaxws='http://cxf.apache.org/jaxws' - xmlns:wsp='http://www.w3.org/2006/07/ws-policy' - xmlns:p='http://cxf.apache.org/policy' - xsi:schemaLocation='http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://cxf.apache.org/policy - http://cxf.apache.org/schemas/policy.xsd - http://www.w3.org/2006/07/ws-policy - http://www.w3.org/2006/07/ws-policy.xsd - http://cxf.apache.org/jaxws - http://cxf.apache.org/schemas/jaxws.xsd'> - - <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - <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> - - <jaxws:endpoint - id='SimpleServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsrm' - implementor='org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> - </jaxws:invoker> - <jaxws:features> - <p:policies> - <wsp:PolicyReference URI="#wsrm10policy" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - -</beans> Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2010-08-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2010-08-13 07:08:06 UTC (rev 12790) @@ -1,14 +1,5 @@ <?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"> - - <wsp:UsingPolicy/> - <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"> - <wsp:Policy/> - </wswa:UsingAddressing> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> - </wsp: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"/> @@ -54,7 +45,10 @@ </wsdl:operation> </wsdl:portType> <wsdl:binding name="SimpleServiceSoapBinding" type="tns:SimpleService"> - <wsp:PolicyReference URI="#wsrm10policy"/> + <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"/> 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-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-08-13 07:08:06 UTC (rev 12790) @@ -73,7 +73,20 @@ <include name="org/jboss/test/ws/jaxws/cxf/management/HelloWorld.class"/> </classes> </war> - + + <!-- jaxws-samples-mtom --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-mtom.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/mtom/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/mtom/jaxws/*.class"/> + </classes> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/mtom/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + <!-- jaxws-samples-wsa --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java 2010-08-12 09:27:44 UTC (rev 12776) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -1,118 +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.mtom; - -import java.io.OutputStreamWriter; -import java.net.HttpURLConnection; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import junit.framework.Test; -import org.apache.cxf.helpers.IOUtils; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -/** - * Client invoking web service using MTOM - * - */ -public final class MtomTestCase extends JBossWSTest -{ - private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-mtom/MtomService"; - private ServiceIface proxy; - - public static Test suite() - { - return new JBossWSTestSetup(MtomTestCase.class, "jaxws-samples-mtom.war"); - } - - public void testMtomWithProxy() throws Exception - { - // construct proxy - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/mtom";, "MtomService"); - URL wsdlURL = new URL(serviceURL + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - proxy = (ServiceIface)service.getPort(ServiceIface.class); - // invoke method - assertEquals("Hello World!", proxy.sayHello()); - } - - public void testMtomWithoutProxy() throws Exception - { - final String mtomPayload = "--uuid:b7a481a7-274a-42ed-8b84-9bb2280fb2e7\r\n" - + "Content-Type: application/xop+xml; charset=UTF-8; type=\"text/xml\"\r\n" - + "Content-Transfer-Encoding: binary\r\n" - + "Content-ID: <root.message(a)cxf.apache.org&gt;\r\n\r\n&quot; - + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><... - + "<ns2:sayHello xmlns:ns2=\"http://www.jboss.org/jbossws/ws-extensions/mtom\" " - + "xmlns:ns3=\"http://www.jboss.org/jbossws/ws-extensions/wsaddressing\"/></soap:Body></soap:Envelope>\r\n" - + "--uuid:b7a481a7-274a-42ed-8b84-9bb2280fb2e7--"; - - HttpURLConnection conn = (HttpURLConnection)new URL(serviceURL).openConnection(); - conn.setDoOutput(true); - conn.setRequestMethod("POST"); - conn.setRequestProperty("Content-Type", - "multipart/related; type=\"application/xop+xml\"; boundary=\"uuid:b7a481a7-274a-42ed-8b84-9bb2280fb2e7\";" - + " start=\&quot;&lt;root.message(a)cxf.apache.org&gt;\&quot;; start-info=\"text/xml\""); - conn.setRequestProperty("Content-Length", Integer.toString(mtomPayload.length())); - OutputStreamWriter out = new OutputStreamWriter(conn.getOutputStream()); - out.write(mtomPayload); - out.flush(); - out.close(); - - assertEquals(200, conn.getResponseCode()); - String response = IOUtils.readStringFromStream(conn.getInputStream()); - - assertTrue(response.contains("--uuid")); - assertTrue(response.contains("<return>Hello World!</return>")); - } - - public void testMtomNotUsed() throws Exception - { - final String envelope = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><... - + "<ns2:sayHello xmlns:ns2=\"http://www.jboss.org/jbossws/ws-extensions/mtom\" " - + "xmlns:ns3=\"http://www.jboss.org/jbossws/ws-extensions/wsaddressing\"/></soap:Body></soap:Envelope>"; - - HttpURLConnection conn = (HttpURLConnection)new URL(serviceURL).openConnection(); - conn.setDoOutput(true); - conn.setRequestMethod("POST"); - conn.setRequestProperty("Content-Type", "text/xml"); - conn.setRequestProperty("Content-Length", Integer.toString(envelope.length())); - OutputStreamWriter out = new OutputStreamWriter(conn.getOutputStream()); - out.write(envelope); - out.flush(); - out.close(); - - assertEquals(500, conn.getResponseCode()); - Element responseEl = DOMUtils.parse(conn.getErrorStream()); - - NodeList list = responseEl.getElementsByTagName("faultstring"); - String text = list.item(0).getTextContent(); - assertTrue(text.contains("These policy alternatives can not be satisfied: ")); - assertTrue(text.contains("{http://schemas.xmlsoap.org/ws/2004/09/pol... - + "OptimizedMimeSerialization")); - } -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -0,0 +1,118 @@ +/* + * 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.mtom; + +import java.io.OutputStreamWriter; +import java.net.HttpURLConnection; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; +import org.apache.cxf.helpers.IOUtils; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +/** + * Client invoking web service using MTOM + * + */ +public final class MtomTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-mtom/MtomService"; + private ServiceIface proxy; + + public static Test suite() + { + return new JBossWSTestSetup(MtomTestCase.class, "jaxws-samples-mtom.war"); + } + + public void testMtomWithProxy() throws Exception + { + // construct proxy + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/mtom";, "MtomService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + proxy = (ServiceIface)service.getPort(ServiceIface.class); + // invoke method + assertEquals("Hello World!", proxy.sayHello()); + } + + public void testMtomWithoutProxy() throws Exception + { + final String mtomPayload = "--uuid:b7a481a7-274a-42ed-8b84-9bb2280fb2e7\r\n" + + "Content-Type: application/xop+xml; charset=UTF-8; type=\"text/xml\"\r\n" + + "Content-Transfer-Encoding: binary\r\n" + + "Content-ID: <root.message(a)cxf.apache.org&gt;\r\n\r\n&quot; + + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><... + + "<ns2:sayHello xmlns:ns2=\"http://www.jboss.org/jbossws/ws-extensions/mtom\" " + + "xmlns:ns3=\"http://www.jboss.org/jbossws/ws-extensions/wsaddressing\"/></soap:Body></soap:Envelope>\r\n" + + "--uuid:b7a481a7-274a-42ed-8b84-9bb2280fb2e7--"; + + HttpURLConnection conn = (HttpURLConnection)new URL(serviceURL).openConnection(); + conn.setDoOutput(true); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Content-Type", + "multipart/related; type=\"application/xop+xml\"; boundary=\"uuid:b7a481a7-274a-42ed-8b84-9bb2280fb2e7\";" + + " start=\&quot;&lt;root.message(a)cxf.apache.org&gt;\&quot;; start-info=\"text/xml\""); + conn.setRequestProperty("Content-Length", Integer.toString(mtomPayload.length())); + OutputStreamWriter out = new OutputStreamWriter(conn.getOutputStream()); + out.write(mtomPayload); + out.flush(); + out.close(); + + assertEquals(200, conn.getResponseCode()); + String response = IOUtils.readStringFromStream(conn.getInputStream()); + + assertTrue(response.contains("--uuid")); + assertTrue(response.contains("<return>Hello World!</return>")); + } + + public void testMtomNotUsed() throws Exception + { + final String envelope = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><... + + "<ns2:sayHello xmlns:ns2=\"http://www.jboss.org/jbossws/ws-extensions/mtom\" " + + "xmlns:ns3=\"http://www.jboss.org/jbossws/ws-extensions/wsaddressing\"/></soap:Body></soap:Envelope>"; + + HttpURLConnection conn = (HttpURLConnection)new URL(serviceURL).openConnection(); + conn.setDoOutput(true); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Content-Type", "text/xml"); + conn.setRequestProperty("Content-Length", Integer.toString(envelope.length())); + OutputStreamWriter out = new OutputStreamWriter(conn.getOutputStream()); + out.write(envelope); + out.flush(); + out.close(); + + assertEquals(500, conn.getResponseCode()); + Element responseEl = DOMUtils.parse(conn.getErrorStream()); + + NodeList list = responseEl.getElementsByTagName("faultstring"); + String text = list.item(0).getTextContent(); + assertTrue(text.contains("These policy alternatives can not be satisfied: ")); + assertTrue(text.contains("{http://schemas.xmlsoap.org/ws/2004/09/pol... + + "OptimizedMimeSerialization")); + } +} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java 2010-08-12 09:27:44 UTC (rev 12776) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -1,35 +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.mtom; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -@WebService -( - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/mtom" -) -public interface ServiceIface -{ - @WebMethod - String sayHello(); -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceIface.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -0,0 +1,35 @@ +/* + * 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.mtom; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/mtom" +) +public interface ServiceIface +{ + @WebMethod + String sayHello(); +} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java 2010-08-12 09:27:44 UTC (rev 12776) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -1,41 +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.mtom; - -import javax.jws.WebService; -import javax.xml.ws.soap.Addressing; - -@WebService -( - portName = "MtomServicePort", - serviceName = "MtomService", - wsdlLocation = "WEB-INF/wsdl/MtomService.wsdl", - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/mtom", - endpointInterface = "org.jboss.test.ws.jaxws.samples.mtom.ServiceIface" -) -public class ServiceImpl implements ServiceIface -{ - public String sayHello() - { - return "Hello World!"; - } -} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/ServiceImpl.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.mtom; + +import javax.jws.WebService; +import javax.xml.ws.soap.Addressing; + +@WebService +( + portName = "MtomServicePort", + serviceName = "MtomService", + wsdlLocation = "WEB-INF/wsdl/MtomService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/mtom", + endpointInterface = "org.jboss.test.ws.jaxws.samples.mtom.ServiceIface" +) +public class ServiceImpl implements ServiceIface +{ + public String sayHello() + { + return "Hello World!"; + } +} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java 2010-08-12 09:27:44 UTC (rev 12776) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -1,33 +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.mtom.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/mtom") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/mtom") - -public class SayHello {} Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHello.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -0,0 +1,33 @@ +/* + * 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.mtom.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/mtom") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/mtom") + +public class SayHello {} Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHelloResponse.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHelloResponse.java 2010-08-12 09:27:44 UTC (rev 12776) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHelloResponse.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -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.mtom.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 - * Mon Apr 21 16:36:02 CEST 2008 - * Generated source version: 2.0.5-incubator - */ -@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") -public class SayHelloResponse -{ - - @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/mtom/jaxws/SayHelloResponse.java (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHelloResponse.java) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHelloResponse.java (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/mtom/jaxws/SayHelloResponse.java 2010-08-13 07:08:06 UTC (rev 12790) @@ -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.mtom.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 + * Mon Apr 21 16:36:02 CEST 2008 + * Generated source version: 2.0.5-incubator + */ +@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") +public class SayHelloResponse +{ + + @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/resources/jaxws/samples/mtom (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom) Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/web.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/web.xml 2010-08-12 09:27:44 UTC (rev 12776) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/web.xml 2010-08-13 07:08:06 UTC (rev 12790) @@ -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>MtomService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.mtom.ServiceImpl</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>MtomService</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/mtom/WEB-INF/web.xml (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/web.xml) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/web.xml (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/web.xml 2010-08-13 07:08:06 UTC (rev 12790) @@ -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>MtomService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.mtom.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>MtomService</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/mtom/WEB-INF/wsdl (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl) Deleted: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl 2010-08-12 09:27:44 UTC (rev 12776) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl 2010-08-13 07:08:06 UTC (rev 12790) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="MtomService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/mtom" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/mtom" 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/mtom" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/mtom&quo... -<xsd:element name="sayHello" type="tns:sayHello"/> -<xsd:complexType name="sayHello"> -<xsd:sequence/> -</xsd:complexType> -<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/> -<xsd:complexType name="sayHelloResponse"> -<xsd:sequence> -<xsd:element minOccurs="0" name="return" type="xsd:string"/> -</xsd:sequence> -</xsd:complexType> -</xsd:schema> - </wsdl:types> - <wsdl:message name="sayHelloResponse"> - <wsdl:part name="parameters" element="tns:sayHelloResponse"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="sayHello"> - <wsdl:part name="parameters" element="tns:sayHello"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="ServiceIface"> - <wsdl:operation name="sayHello"> - <wsdl:input name="sayHello" message="tns:sayHello"> - </wsdl:input> - <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="MtomServiceSoapBinding" type="tns:ServiceIface"> - <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy" - xmlns:mtom="http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmi... - <mtom:OptimizedMimeSerialization /> - </wsp:Policy> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="sayHello"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="sayHello"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="sayHelloResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="MtomService"> - <wsdl:port name="MtomServicePort" binding="tns:MtomServiceSoapBinding"> - <soap:address location="http://localhost:8080/MtomService"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl (from rev 12776, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl) =================================================================== --- stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl (rev 0) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl 2010-08-13 07:08:06 UTC (rev 12790) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="MtomService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/mtom" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/mtom" 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/mtom" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/mtom&quo... +<xsd:element name="sayHello" type="tns:sayHello"/> +<xsd:complexType name="sayHello"> +<xsd:sequence/> +</xsd:complexType> +<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/> +<xsd:complexType name="sayHelloResponse"> +<xsd:sequence> +<xsd:element minOccurs="0" name="return" type="xsd:string"/> +</xsd:sequence> +</xsd:complexType> +</xsd:schema> + </wsdl:types> + <wsdl:message name="sayHelloResponse"> + <wsdl:part name="parameters" element="tns:sayHelloResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="sayHello"> + <wsdl:part name="parameters" element="tns:sayHello"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="ServiceIface"> + <wsdl:operation name="sayHello"> + <wsdl:input name="sayHello" message="tns:sayHello"> + </wsdl:input> + <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="MtomServiceSoapBinding" type="tns:ServiceIface"> + <wsp:Policy xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:mtom="http://schemas.xmlsoap.org/ws/2004/09/policy/optimizedmi... + <mtom:OptimizedMimeSerialization /> + </wsp:Policy> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="sayHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="sayHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="MtomService"> + <wsdl:port name="MtomServicePort" binding="tns:MtomServiceSoapBinding"> + <soap:address location="http://localhost:8080/MtomService"/> + </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-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss501.txt 2010-08-13 07:08:06 UTC (rev 12790) @@ -49,15 +49,9 @@ # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** -# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints -org/jboss/test/ws/jaxws/jbws2268/** - # [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-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss510.txt 2010-08-13 07:08:06 UTC (rev 12790) @@ -49,15 +49,9 @@ # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** -# [JBWS-3001] Verify @PostConstruct and @PreDestroy annotations support for POJO based endpoints -org/jboss/test/ws/jaxws/jbws2268/** - # [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-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss600.txt 2010-08-13 07:08:06 UTC (rev 12790) @@ -43,8 +43,3 @@ # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** -# [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-12 12:41:05 UTC (rev 12789) +++ stack/cxf/branches/cxf-2.3/modules/testsuite/test-excludes-jboss601.txt 2010-08-13 07:08:06 UTC (rev 12790) @@ -43,12 +43,6 @@ # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** -# [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/**