August 2010 - jbossws-commits - Jboss List Archives

JBossWS SVN: r12741 - in stack/cxf/trunk: modules/server and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: sergeyb Date: 2010-08-05 09:35:43 -0400 (Thu, 05 Aug 2010) New Revision: 12741 Removed: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-jms-config-as6.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/src/main/distro/build-deploy.xml Log: [JBWS-3094] Reverting r12731 Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-08-05 13:29:33 UTC (rev 12740) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-08-05 13:35:43 UTC (rev 12741) @@ -29,7 +29,6 @@ <include name="**/commons-collections.jar"/> <include name="**/commons-lang.jar"/> <include name="**/cxf-*.jar"/> - <exclude name="**/cxf-rt-transports-jms.jar"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/jaxb-xjc.jar"/> @@ -70,7 +69,6 @@ <include name="**/asm.jar"/> <include name="**/commons-beanutils.jar"/> <include name="**/cxf-*.jar"/> - <exclude name="**/cxf-rt-transports-jms.jar"/> <include name="**/FastInfoset.jar"/> <include name="**/jaxrpc-api.jar"/> <include name="**/jaxws-api.jar"/> @@ -105,10 +103,6 @@ <include name="**/spring-tx.jar"/> </patternset> - <patternset id="cxf.jms.patternset"> - <include name="**/cxf-rt-transports-jms.jar"/> - </patternset> -    @@ -360,28 +354,6 @@ </target>  -  -  - - <macrodef name="macro-install-cxf-jms"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="cxf.jms.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <target name="deploy-cxf-jms"> - <macro-install-cxf-jms targetdir="${installserver}/client" thirdpartydir="${thirdpartydir}"/> - <macro-install-cxf-jms targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/> - </target> - -    Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-08-05 13:29:33 UTC (rev 12740) +++ stack/cxf/trunk/modules/server/pom.xml 2010-08-05 13:35:43 UTC (rev 12741) @@ -333,9 +333,7 @@ </goals> <configuration> <tasks> - <ant antfile="src/main/scripts/antrun-beans-config.xml"> - <property name="spring" value="${spring}"/> - </ant> + <ant antfile="src/main/scripts/antrun-beans-config.xml" /> </tasks> </configuration> </execution> @@ -387,17 +385,6 @@ </plugins> </build> </profile> - -  - <profile> - <id>spring</id> - <properties> - <spring>true</spring> - </properties> - </profile> </profiles> </project> Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-08-05 13:29:33 UTC (rev 12740) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-08-05 13:35:43 UTC (rev 12741) @@ -86,5 +86,16 @@ <property name="requires">ResourceResolver,StackDescriptor</property> <property name="forJaxRpc">false</property> </bean> - -</deployment> + +  + <bean name="JMSEndpointDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointDeploymentAspect"> + <property name="provides">BusHolder</property> + <property name="forJaxRpc">false</property> + </bean> + + <bean name="JMSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointRegistryDeploymentAspect"> + <property name="requires">BusHolder</property> + <property name="forJaxRpc">false</property> + </bean> + +</deployment> \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-jms-config-as6.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-jms-config-as6.xml 2010-08-05 13:29:33 UTC (rev 12740) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-jms-config-as6.xml 2010-08-05 13:35:43 UTC (rev 12741) @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - -  - <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> - <property name="namespaces"> - <list class="java.util.LinkedList" elementClass="java.lang.String"> - <value>org.apache.cxf</value> - </list> - </property> - </bean> - - <bean name="CXFJMSDescriptorProcessor" class="org.jboss.wsf.stack.cxf.deployment.jms.JMSDescriptorProcessorImpl"> - <property name="validating">false</property> - <property name="descriptorName">jbossws-cxf.xml</property> - </bean> - -  - <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> - <property name="recording">false</property> - </bean> - <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> - <property name="recording">false</property> - </bean> - -  - <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>stack.transport.class.provider</key> - <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value> - </entry> - </map> - </property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect"> - <property name="requires">EndpointAddress,JAXBIntros</property> - <property name="provides">StackDescriptor</property> - <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> - <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> - <property name="requires">JmsEndpointAddress</property> - <property name="provides">ResourceResolver</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="processors"> - <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> - </list> - </property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect"> - <property name="provides">JAXBIntros</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFBusDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> - <property name="provides">BusHolder</property> - <property name="requires">ResourceResolver,StackDescriptor</property> - <property name="forJaxRpc">false</property> - </bean> - -  - <bean name="JMSEndpointDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointDeploymentAspect"> - <property name="provides">BusHolder</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="JMSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointRegistryDeploymentAspect"> - <property name="requires">BusHolder</property> - <property name="forJaxRpc">false</property> - </bean> - -</deployment> \ No newline at end of file Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-08-05 13:29:33 UTC (rev 12740) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-08-05 13:35:43 UTC (rev 12741) @@ -14,19 +14,8 @@ <property name="src.dir" value="${basedir}/src/main/resources"/> <property name="dest.dir" value="${basedir}/target/resources"/> - <target name="check-spring"> - <condition property="spring-required"> - <and> - <istrue value="${spring}"/> - </and> - </condition> - </target> + <target name="main"> - <target name="main" - depends="check-spring,copy-config-as5,copy-config-as6,copy-config-as6-jms,copy-config-as6-jaxrpc"/> - - <target name="copy-config-as5"> - <copy file="${src.dir}/jbossws-cxf-config-as5.xml" tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" @@ -37,10 +26,6 @@ tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> - </target> - - <target name="copy-config-as6" unless="spring-required"> - <copy file="${src.dir}/jbossws-cxf-config-as6.xml" tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" @@ -51,26 +36,7 @@ tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> - </target> - - <target name="copy-config-as6-jms" if="spring-required"> - <copy - file="${src.dir}/jbossws-cxf-jms-config-as6.xml" - tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-jms-config-as6.xml" - tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - </target> - - - <target name="copy-config-as6-jaxrpc"> - - <copy file="${src.dir}/jbossws-jaxrpc-config-as6.xml" tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> @@ -81,4 +47,5 @@ /> </target> + </project> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-08-05 13:29:33 UTC (rev 12740) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-08-05 13:35:43 UTC (rev 12741) @@ -35,8 +35,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50,check-spring,install-spring" - description="Deploy jbossws to jboss501"> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50,check-spring,install-spring" description="Deploy jbossws to jboss501"> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true" verbose="true"> @@ -78,8 +77,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51,check-spring,install-spring" - description="Deploy jbossws to jboss510"> + <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51,check-spring,install-spring" description="Deploy jbossws to jboss510"> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> <copy todir="${jboss510.home}" overwrite="true" verbose="true"> @@ -121,8 +119,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600,check-spring,install-spring,install-cxf-jms" - description="Deploy jbossws to jboss600"> + <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600,check-spring,install-spring" description="Deploy jbossws to jboss600"> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> <copy todir="${jboss600.home}" overwrite="true" verbose="true"> @@ -164,8 +161,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring,install-cxf-jms" - description="Deploy jbossws to jboss601"> + <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring" description="Deploy jbossws to jboss601"> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/> <copy todir="${jboss601.home}" overwrite="true" verbose="true"> @@ -201,13 +197,6 @@ </antcall> </target> - <target name="install-cxf-jms" if="spring-required"> - <antcall target="deploy-cxf-jms" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> - </target> -

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12740 - stack/cxf/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: sergeyb Date: 2010-08-05 09:29:33 -0400 (Thu, 05 Aug 2010) New Revision: 12740 Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml Log: [JBWS-3094] Reverting r12738 Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-08-05 13:24:07 UTC (rev 12739) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-08-05 13:29:33 UTC (rev 12740) @@ -201,7 +201,7 @@ </antcall> </target> - <target name="install-cxf-jms"> + <target name="install-cxf-jms" if="spring-required"> <antcall target="deploy-cxf-jms" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12739 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: sergeyb Date: 2010-08-05 09:24:07 -0400 (Thu, 05 Aug 2010) New Revision: 12739 Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java Log: [JBWS-3094] Adding JMS aspect delegates to be invoked only if Spring is available Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2010-08-05 08:39:41 UTC (rev 12738) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2010-08-05 13:24:07 UTC (rev 12739) @@ -30,6 +30,13 @@ */ public class SpringUtils { + public static final boolean SPRING_AVAILABLE; + static + { + SPRING_AVAILABLE = + isSpringAvailable(SpringUtils.class.getClassLoader(), + Thread.currentThread().getContextClassLoader()); + } /** * Check if Spring is available using the provided classloader * @@ -44,6 +51,10 @@ } for (ClassLoader cl : loaders) { + if (cl == null) + { + continue; + } try { cl.loadClass("org.springframework.context.ApplicationContext"); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java 2010-08-05 08:39:41 UTC (rev 12738) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java 2010-08-05 13:24:07 UTC (rev 12739) @@ -33,6 +33,7 @@ import org.jboss.wsf.common.integration.JMSDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; +import org.jboss.wsf.stack.cxf.client.util.SpringUtils; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.springframework.jms.connection.SingleConnectionFactory; @@ -43,81 +44,31 @@ */ public class JMSEndpointDeploymentAspect extends JMSDeploymentAspect { - private BusHolder busHolder = null; +private JMSEndpointDeploymentAspectDelegate aspect; + public JMSEndpointDeploymentAspect() + { + if (SpringUtils.SPRING_AVAILABLE) + { + aspect = new JMSEndpointDeploymentAspectDelegate(); + } + } + + @Override public void start(Deployment dep) { - //TODO:handler JAXBIntro - if (dep.getAttachment(JMSEndpointsMetaData.class) != null) + if (aspect != null) { - JMSEndpointsMetaData jmsEndpoints = dep.getAttachment(JMSEndpointsMetaData.class); - URL url = jmsEndpoints.getDescriptorURL(); - - ClassLoader origClassLoader = SecurityActions.getContextClassLoader(); - try - { - SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader()); - SpringBusFactory bf = new SpringBusFactory(); - Bus bus = bf.createBus(url); - dep.addAttachment(Bus.class, bus); - } - catch (Exception e) - { - log.error("Failed to deploy jms endpoints deployment " + url); - throw new RuntimeException(e); - } - - finally - { - BusFactory.setDefaultBus(null); - SecurityActions.setContextClassLoader(origClassLoader); - } + aspect.start(dep); } } - - @Override + public void stop(Deployment dep) { - log.debug("Undeploying jms endpoints in " + dep.getSimpleName()); - if (busHolder != null && busHolder.getBus() != null) + if (aspect != null) { - //CXF uses WrappedConnectionFactory to create "jmsListener". DefaultMessageListenerContainer.shutdown() can not colse all the jms connections. - //We need to explicitly call detroy() to close connection. This should be fixed in CXF side. - SingleConnectionFactory connectionFactory = null; - Server jmsServer = null; - ServerRegistry serRegistry = busHolder.getBus().getExtension(ServerRegistry.class); - for (Server server : serRegistry.getServers()) - { - if (server.getDestination() != null && server.getDestination() instanceof JMSDestination) - { - JMSDestination jmsDestination = (JMSDestination) server.getDestination(); - JMSConfiguration jmsConfig = jmsDestination.getJmsConfig(); - if (jmsConfig.getWrappedConnectionFactory() != null - && jmsConfig.getWrappedConnectionFactory() instanceof SingleConnectionFactory) - { - connectionFactory = (SingleConnectionFactory) jmsConfig - .getWrappedConnectionFactory(); - jmsServer = server; - } - - } - - } - - if (jmsServer != null) - { - jmsServer.stop(); - } - - if (connectionFactory != null) - { - connectionFactory.destroy(); - } - //TODO:Remove above code after fix CXF-2788 - //close LifecycleListener if exists - busHolder.getBus().shutdown(false); - busHolder.close(); + aspect.stop(dep); } } } Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-08-05 13:24:07 UTC (rev 12739) @@ -0,0 +1,124 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.deployment.aspect; + +import java.net.URL; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.apache.cxf.endpoint.Server; +import org.apache.cxf.endpoint.ServerRegistry; +import org.apache.cxf.transport.jms.JMSConfiguration; +import org.apache.cxf.transport.jms.JMSDestination; +import org.jboss.wsf.common.integration.JMSDeploymentAspect; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; +import org.jboss.wsf.stack.cxf.configuration.BusHolder; +import org.springframework.jms.connection.SingleConnectionFactory; + +/** + * To start the jms endpoints + * + * @author <a href="ema(a)redhat.com">Jim Ma</a> + */ +public class JMSEndpointDeploymentAspectDelegate extends JMSDeploymentAspect +{ + private BusHolder busHolder = null; + + @Override + public void start(Deployment dep) + { + //TODO:handler JAXBIntro + if (dep.getAttachment(JMSEndpointsMetaData.class) != null) + { + JMSEndpointsMetaData jmsEndpoints = dep.getAttachment(JMSEndpointsMetaData.class); + URL url = jmsEndpoints.getDescriptorURL(); + + ClassLoader origClassLoader = SecurityActions.getContextClassLoader(); + try + { + SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader()); + SpringBusFactory bf = new SpringBusFactory(); + Bus bus = bf.createBus(url); + dep.addAttachment(Bus.class, bus); + } + catch (Exception e) + { + log.error("Failed to deploy jms endpoints deployment " + url); + throw new RuntimeException(e); + } + + finally + { + BusFactory.setDefaultBus(null); + SecurityActions.setContextClassLoader(origClassLoader); + } + } + } + + @Override + public void stop(Deployment dep) + { + log.debug("Undeploying jms endpoints in " + dep.getSimpleName()); + if (busHolder != null && busHolder.getBus() != null) + { + //CXF uses WrappedConnectionFactory to create "jmsListener". DefaultMessageListenerContainer.shutdown() can not colse all the jms connections. + //We need to explicitly call detroy() to close connection. This should be fixed in CXF side. + SingleConnectionFactory connectionFactory = null; + Server jmsServer = null; + ServerRegistry serRegistry = busHolder.getBus().getExtension(ServerRegistry.class); + for (Server server : serRegistry.getServers()) + { + if (server.getDestination() != null && server.getDestination() instanceof JMSDestination) + { + JMSDestination jmsDestination = (JMSDestination) server.getDestination(); + JMSConfiguration jmsConfig = jmsDestination.getJmsConfig(); + if (jmsConfig.getWrappedConnectionFactory() != null + && jmsConfig.getWrappedConnectionFactory() instanceof SingleConnectionFactory) + { + connectionFactory = (SingleConnectionFactory) jmsConfig + .getWrappedConnectionFactory(); + jmsServer = server; + } + + } + + } + + if (jmsServer != null) + { + jmsServer.stop(); + } + + if (connectionFactory != null) + { + connectionFactory.destroy(); + } + //TODO:Remove above code after fix CXF-2788 + //close LifecycleListener if exists + busHolder.getBus().shutdown(false); + busHolder.close(); + } + } +} + Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java ___________________________________________________________________ Name: svn:keywords + Rev Date Name: svn:eol-style + native Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2010-08-05 08:39:41 UTC (rev 12738) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2010-08-05 13:24:07 UTC (rev 12739) @@ -40,6 +40,7 @@ import org.jboss.wsf.spi.deployment.JMSEndpoint; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.stack.cxf.client.util.SpringUtils; /** * The DeploymentAspect to register the jms endpoints @@ -48,71 +49,33 @@ */ public class JMSEndpointRegistryDeploymentAspect extends JMSDeploymentAspect { - private EndpointRegistry registry = null; - @Override - public void start(Deployment dep) + private JMSEndpointRegistryDeploymentAspectDelegate aspect; + + public JMSEndpointRegistryDeploymentAspect() { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - if (registry == null) - registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - Bus bus = dep.getAttachment(Bus.class); - Map<String, JMSConfiguration> jmsConfigMap = createEndpointJmsConfigMap(bus); - for (Endpoint endpoint : dep.getService().getEndpoints()) + if (SpringUtils.SPRING_AVAILABLE) { - JMSEndpoint jmsEndpoint = (JMSEndpoint)endpoint; - String endpointImplClass = jmsEndpoint.getTargetBeanName(); - JMSConfiguration jmsConfig = jmsConfigMap.get(endpointImplClass); - if (jmsConfig != null) - { - jmsEndpoint.setTargetDestination(jmsConfig.getTargetDestination()); - jmsEndpoint.setReplyDestination(jmsConfig.getReplyDestination()); - } - - registry.register(jmsEndpoint); + aspect = new JMSEndpointRegistryDeploymentAspectDelegate(); } } - public void stop(Deployment dep) + + @Override + public void start(Deployment dep) { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - if (registry == null) - registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - for (Endpoint ep : dep.getService().getEndpoints()) + if (aspect != null) { - registry.unregister(ep); + aspect.start(dep); } } - - private Map<String, JMSConfiguration> createEndpointJmsConfigMap(Bus bus) + + public void stop(Deployment dep) { - Map<String, JMSConfiguration> endpointJmsConfigMap = new java.util.HashMap<String, JMSConfiguration>(); - ServerRegistry serverRegsitry = bus.getExtension(ServerRegistry.class); - for (Server server : serverRegsitry.getServers()) + if (aspect != null) { - Destination destination = server.getDestination(); - if (destination instanceof JMSDestination) - { - JMSConfiguration jmsConfiguration = ((JMSDestination)destination).getJmsConfig(); - String implClassName = getEndpointClassName(server); - if (implClassName != null) - { - endpointJmsConfigMap.put(implClassName, jmsConfiguration); - } - } + aspect.stop(dep); } - return endpointJmsConfigMap; } - - private String getEndpointClassName(Server server) - { - MethodDispatcher methodDispatcher = (SimpleMethodDispatcher) server.getEndpoint().getService().get( - MethodDispatcher.class.getName()); - if (methodDispatcher != null && methodDispatcher instanceof SimpleMethodDispatcher) - { - Method method = ((SimpleMethodDispatcher)methodDispatcher).getPrimaryMethod(server.getEndpoint().getEndpointInfo().getInterface() - .getOperations().iterator().next()); - return method != null ? method.getDeclaringClass().getName() : null; - } - return null; - } + + } Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java 2010-08-05 13:24:07 UTC (rev 12739) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.cxf.deployment.aspect; + +import java.lang.reflect.Method; +import java.util.Map; + +import org.apache.cxf.Bus; +import org.apache.cxf.endpoint.Server; +import org.apache.cxf.endpoint.ServerRegistry; +import org.apache.cxf.frontend.MethodDispatcher; +import org.apache.cxf.frontend.SimpleMethodDispatcher; +import org.apache.cxf.transport.Destination; +import org.apache.cxf.transport.jms.JMSConfiguration; +import org.apache.cxf.transport.jms.JMSDestination; +import org.jboss.wsf.common.integration.JMSDeploymentAspect; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.JMSEndpoint; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; + +/** + * The DeploymentAspect to register the jms endpoints + * + * @author <a href="ema(a)redhat.com">Jim Ma</a> + */ +class JMSEndpointRegistryDeploymentAspectDelegate extends JMSDeploymentAspect +{ + private EndpointRegistry registry = null; + @Override + public void start(Deployment dep) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + if (registry == null) + registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + Bus bus = dep.getAttachment(Bus.class); + Map<String, JMSConfiguration> jmsConfigMap = createEndpointJmsConfigMap(bus); + for (Endpoint endpoint : dep.getService().getEndpoints()) + { + JMSEndpoint jmsEndpoint = (JMSEndpoint)endpoint; + String endpointImplClass = jmsEndpoint.getTargetBeanName(); + JMSConfiguration jmsConfig = jmsConfigMap.get(endpointImplClass); + if (jmsConfig != null) + { + jmsEndpoint.setTargetDestination(jmsConfig.getTargetDestination()); + jmsEndpoint.setReplyDestination(jmsConfig.getReplyDestination()); + } + + registry.register(jmsEndpoint); + } + } + + public void stop(Deployment dep) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + if (registry == null) + registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + registry.unregister(ep); + } + } + + private Map<String, JMSConfiguration> createEndpointJmsConfigMap(Bus bus) + { + Map<String, JMSConfiguration> endpointJmsConfigMap = new java.util.HashMap<String, JMSConfiguration>(); + ServerRegistry serverRegsitry = bus.getExtension(ServerRegistry.class); + for (Server server : serverRegsitry.getServers()) + { + Destination destination = server.getDestination(); + if (destination instanceof JMSDestination) + { + JMSConfiguration jmsConfiguration = ((JMSDestination)destination).getJmsConfig(); + String implClassName = getEndpointClassName(server); + if (implClassName != null) + { + endpointJmsConfigMap.put(implClassName, jmsConfiguration); + } + } + } + return endpointJmsConfigMap; + } + + private String getEndpointClassName(Server server) + { + MethodDispatcher methodDispatcher = (SimpleMethodDispatcher) server.getEndpoint().getService().get( + MethodDispatcher.class.getName()); + if (methodDispatcher != null && methodDispatcher instanceof SimpleMethodDispatcher) + { + Method method = ((SimpleMethodDispatcher)methodDispatcher).getPrimaryMethod(server.getEndpoint().getEndpointInfo().getInterface() + .getOperations().iterator().next()); + return method != null ? method.getDeclaringClass().getName() : null; + } + return null; + } +} Property changes on: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java ___________________________________________________________________ Name: svn:keywords + Rev Date Name: svn:eol-style + native

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12738 - stack/cxf/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: sergeyb Date: 2010-08-05 04:39:41 -0400 (Thu, 05 Aug 2010) New Revision: 12738 Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml Log: [JBWS-3094] cxf-rt-transports-jms module needs to be copied even for non-Spring deployments Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-08-05 05:50:01 UTC (rev 12737) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-08-05 08:39:41 UTC (rev 12738) @@ -201,7 +201,7 @@ </antcall> </target> - <target name="install-cxf-jms" if="spring-required"> + <target name="install-cxf-jms"> <antcall target="deploy-cxf-jms" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12737 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-08-05 01:50:01 -0400 (Thu, 05 Aug 2010) New Revision: 12737 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java Log: Fixing regression Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-04 19:47:08 UTC (rev 12736) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-05 05:50:01 UTC (rev 12737) @@ -98,6 +98,7 @@ private static void initPolicyEngine(PolicyEngineImpl engine, Bus bus) { engine.setBus(bus); + engine.addBusInterceptors(); //required for Apache CXF 2.2.x only, this is automatically done in setBus(..) starting from 2.3 AssertionBuilderRegistry assertionBuilderRegistry = new AssertionBuilderRegistryImpl(); bus.setExtension(assertionBuilderRegistry, AssertionBuilderRegistry.class); PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl();

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12736 - in thirdparty/cxf/tags/cxf-2.2.6-patch-01: systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: fnasser(a)redhat.com Date: 2010-08-04 15:47:08 -0400 (Wed, 04 Aug 2010) New Revision: 12736 Added: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl thirdparty/cxf/tags/cxf-2.2.6-patch-01/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java Removed: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml Log: Re-sync tag with branch, several files were missing from commits in there Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault) Deleted: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java 2010-08-04 19:21:42 UTC (rev 12735) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -1,101 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.systest.soapfault; - -import java.io.PrintStream; -import java.util.Map; -import java.util.Set; - -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -/* - * This simple SOAPHandler will output the contents of incoming - * and outgoing messages. - */ -public class LoggingHandler implements SOAPHandler<SOAPMessageContext> { - - private PrintStream out; - - public LoggingHandler() { - setLogStream(System.out); - } - - protected final void setLogStream(PrintStream ps) { - out = ps; - } - - public void init(Map c) { - } - - public Set<QName> getHeaders() { - return null; - } - - public boolean handleMessage(SOAPMessageContext smc) { - //System.out.println("LoggingHandler : handleMessage Called...."); - logToSystemOut(smc); - return true; - } - - public boolean handleFault(SOAPMessageContext smc) { - //System.out.println("LoggingHandler : handleFault Called...."); - logToSystemOut(smc); - return true; - } - - // nothing to clean up - public void close(MessageContext messageContext) { - //System.out.println("LoggingHandler : close() Called...."); - } - - // nothing to clean up - public void destroy() { - //System.out.println("LoggingHandler : destroy() Called...."); - } - - /* - * Check the MESSAGE_OUTBOUND_PROPERTY in the context - * to see if this is an outgoing or incoming message. - * Write a brief message to the print stream and - * output the message. The writeTo() method can throw - * SOAPException or IOException - */ - protected void logToSystemOut(SOAPMessageContext smc) { - Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - - if (outboundProperty.booleanValue()) { - //out.println("\nOutbound message:"); - } else { - //out.println("\nInbound message:"); - } - - SOAPMessage message = smc.getMessage(); - try { - message.writeTo(out); - //out.println(); - } catch (Exception e) { - //out.println("Exception in handler: " + e); - e.printStackTrace(); - } - } -} Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java) =================================================================== --- thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java (rev 0) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -0,0 +1,101 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.soapfault; + +import java.io.PrintStream; +import java.util.Map; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +/* + * This simple SOAPHandler will output the contents of incoming + * and outgoing messages. + */ +public class LoggingHandler implements SOAPHandler<SOAPMessageContext> { + + private PrintStream out; + + public LoggingHandler() { + setLogStream(System.out); + } + + protected final void setLogStream(PrintStream ps) { + out = ps; + } + + public void init(Map c) { + } + + public Set<QName> getHeaders() { + return null; + } + + public boolean handleMessage(SOAPMessageContext smc) { + //System.out.println("LoggingHandler : handleMessage Called...."); + logToSystemOut(smc); + return true; + } + + public boolean handleFault(SOAPMessageContext smc) { + //System.out.println("LoggingHandler : handleFault Called...."); + logToSystemOut(smc); + return true; + } + + // nothing to clean up + public void close(MessageContext messageContext) { + //System.out.println("LoggingHandler : close() Called...."); + } + + // nothing to clean up + public void destroy() { + //System.out.println("LoggingHandler : destroy() Called...."); + } + + /* + * Check the MESSAGE_OUTBOUND_PROPERTY in the context + * to see if this is an outgoing or incoming message. + * Write a brief message to the print stream and + * output the message. The writeTo() method can throw + * SOAPException or IOException + */ + protected void logToSystemOut(SOAPMessageContext smc) { + Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + + if (outboundProperty.booleanValue()) { + //out.println("\nOutbound message:"); + } else { + //out.println("\nInbound message:"); + } + + SOAPMessage message = smc.getMessage(); + try { + message.writeTo(out); + //out.println(); + } catch (Exception e) { + //out.println("Exception in handler: " + e); + e.printStackTrace(); + } + } +} Deleted: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java 2010-08-04 19:21:42 UTC (rev 12735) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -1,38 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.systest.soapfault; - -import javax.jws.HandlerChain; -import javax.jws.WebService; - -import org.apache.cxf.soapfault.SoapFaultPortType; -import org.xmlsoap.schemas.soap.envelope.Fault; - -@WebService(endpointInterface = "org.apache.cxf.soapfault.SoapFaultPortType", - serviceName = "SoapFaultService") -@HandlerChain(file = "./handlers.xml", name = "TestHandlerChain") -public class SOAPFaultImpl implements SoapFaultPortType { - public void soapFault(Fault fault) { - System.out.println("Received soap fault message"); - System.out.println("FaultString: " + fault.getFaultstring()); - System.out.println("FaulCode: " + fault.getFaultcode()); - } - -} Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java) =================================================================== --- thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java (rev 0) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -0,0 +1,38 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.systest.soapfault; + +import javax.jws.HandlerChain; +import javax.jws.WebService; + +import org.apache.cxf.soapfault.SoapFaultPortType; +import org.xmlsoap.schemas.soap.envelope.Fault; + +@WebService(endpointInterface = "org.apache.cxf.soapfault.SoapFaultPortType", + serviceName = "SoapFaultService") +@HandlerChain(file = "./handlers.xml", name = "TestHandlerChain") +public class SOAPFaultImpl implements SoapFaultPortType { + public void soapFault(Fault fault) { + System.out.println("Received soap fault message"); + System.out.println("FaultString: " + fault.getFaultstring()); + System.out.println("FaulCode: " + fault.getFaultcode()); + } + +} Deleted: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java 2010-08-04 19:21:42 UTC (rev 12735) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -1,55 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.systest.soapfault; - -import javax.xml.namespace.QName; - -import org.apache.cxf.soapfault.SoapFaultPortType; -import org.apache.cxf.soapfault.SoapFaultService; -import org.apache.cxf.testutil.common.AbstractClientServerTestBase; - -import org.junit.BeforeClass; -import org.junit.Test; - -import org.xmlsoap.schemas.soap.envelope.Fault; - -public class SOAPFaultRequestTestCase extends AbstractClientServerTestBase { - private final QName portName = new QName("http://cxf.apache.org/soapfault", "SoapFaultPortType"); - - @BeforeClass - public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); - } - - @Test - public void testSendSoapFaultRequest() throws Exception { - - SoapFaultService service = new SoapFaultService(); - assertNotNull(service); - - SoapFaultPortType soapFaultPort = service.getPort(portName, SoapFaultPortType.class); - - Fault fault = new Fault(); - fault.setFaultstring("ClientSetFaultString"); - fault.setFaultcode(new QName("http://cxf.apache.org/soapfault", "ClientSetError")); - soapFaultPort.soapFault(fault); - - } - -} Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java) =================================================================== --- thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java (rev 0) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -0,0 +1,55 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.soapfault; + +import javax.xml.namespace.QName; + +import org.apache.cxf.soapfault.SoapFaultPortType; +import org.apache.cxf.soapfault.SoapFaultService; +import org.apache.cxf.testutil.common.AbstractClientServerTestBase; + +import org.junit.BeforeClass; +import org.junit.Test; + +import org.xmlsoap.schemas.soap.envelope.Fault; + +public class SOAPFaultRequestTestCase extends AbstractClientServerTestBase { + private final QName portName = new QName("http://cxf.apache.org/soapfault", "SoapFaultPortType"); + + @BeforeClass + public static void startServers() throws Exception { + assertTrue("server did not launch correctly", launchServer(Server.class)); + } + + @Test + public void testSendSoapFaultRequest() throws Exception { + + SoapFaultService service = new SoapFaultService(); + assertNotNull(service); + + SoapFaultPortType soapFaultPort = service.getPort(portName, SoapFaultPortType.class); + + Fault fault = new Fault(); + fault.setFaultstring("ClientSetFaultString"); + fault.setFaultcode(new QName("http://cxf.apache.org/soapfault", "ClientSetError")); + soapFaultPort.soapFault(fault); + + } + +} Deleted: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java 2010-08-04 19:21:42 UTC (rev 12735) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -1,46 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cxf.systest.soapfault; - -import javax.xml.ws.Endpoint; - -import org.apache.cxf.testutil.common.AbstractBusTestServerBase; - - -public class Server extends AbstractBusTestServerBase { - protected void run() { - String address = "http://localhost:9199/SoapFault"; - - Object implementor1 = new SOAPFaultImpl(); - Endpoint.publish(address, implementor1); - } - - public static void main(String[] args) { - try { - Server s = new Server(); - s.start(); - } catch (Exception ex) { - ex.printStackTrace(); - System.exit(-1); - } finally { - System.out.println("done!"); - } - } -} - Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java) =================================================================== --- thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java (rev 0) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -0,0 +1,46 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.soapfault; + +import javax.xml.ws.Endpoint; + +import org.apache.cxf.testutil.common.AbstractBusTestServerBase; + + +public class Server extends AbstractBusTestServerBase { + protected void run() { + String address = "http://localhost:9199/SoapFault"; + + Object implementor1 = new SOAPFaultImpl(); + Endpoint.publish(address, implementor1); + } + + public static void main(String[] args) { + try { + Server s = new Server(); + s.start(); + } catch (Exception ex) { + ex.printStackTrace(); + System.exit(-1); + } finally { + System.out.println("done!"); + } + } +} + Deleted: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml 2010-08-04 19:21:42 UTC (rev 12735) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml 2010-08-04 19:47:08 UTC (rev 12736) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" -xmlns:cfg="http://cxf.apache.org/configuration/cfg" -xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/javaee"> - <handler-chain> - <handler> - <handler-name>ph1</handler-name> - <handler-class>org.apache.cxf.systest.soapfault.LoggingHandler</handler-class> - <init-param> - <param-name>token</param-name> - <param-value>String</param-value> - </init-param> - </handler> - </handler-chain> -</handler-chains> Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml) =================================================================== --- thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml (rev 0) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml 2010-08-04 19:47:08 UTC (rev 12736) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" +xmlns:cfg="http://cxf.apache.org/configuration/cfg" +xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://java.sun.com/xml/ns/javaee"> + <handler-chain> + <handler> + <handler-name>ph1</handler-name> + <handler-class>org.apache.cxf.systest.soapfault.LoggingHandler</handler-class> + <init-param> + <param-name>token</param-name> + <param-value>String</param-value> + </init-param> + </handler> + </handler-chain> +</handler-chains> Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl) =================================================================== --- thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl (rev 0) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl 2010-08-04 19:47:08 UTC (rev 12736) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> + +<definitions + xmlns:s="http://www.w3.org/2001/XMLSchema" + xmlns:tns="http://cxf.apache.org/soapfault" + xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl" + targetNamespace="http://cxf.apache.org/soapfault" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <s:schema> + <s:import namespace="http://schemas.xmlsoap.org/soap/envelope/" + schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/> + </s:schema> + </types> + <message name="SoapFault"> + <part name="fault" element="soapenv:Fault" /> + </message> + + + + <portType name="SoapFaultPortType"> + <operation name="SoapFault"> + <input name="SoapFault" message="tns:SoapFault" /> + </operation> + </portType> + + + + <binding name="SoapFault_SOAPBinding" type="tns:SoapFaultPortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="SoapFault"> + <input message="tns:Soapfault"> + <soap:body use="literal"/> + </input> + </operation> + </binding> + + <service name="SoapFaultService"> + <port binding="tns:SoapFault_SOAPBinding" name="SoapFaultPortType"> + <wsaw:UsingAddressing required="true"/> + <soap:address location="http://localhost:9199/SoapFault"/> + </port> + </service> +</definitions> Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java) =================================================================== --- thirdparty/cxf/tags/cxf-2.2.6-patch-01/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java (rev 0) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -0,0 +1,63 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.tools.java2wsdl.processor.internal; + +import org.apache.cxf.aegis.databinding.AegisDatabinding; +import org.apache.cxf.databinding.DataBinding; +import org.apache.cxf.frontend.AbstractServiceFactory; +import org.apache.cxf.jaxb.JAXBDataBinding; +import org.apache.cxf.jaxws.JaxwsServiceBuilder; +import org.apache.cxf.service.ServiceBuilder; +import org.apache.cxf.simple.SimpleServiceBuilder; +import org.apache.cxf.tools.common.ToolConstants; +import org.apache.cxf.tools.common.ToolException; +import org.apache.cxf.tools.java2wsdl.processor.FrontendFactory; +import org.apache.cxf.tools.java2wsdl.processor.FrontendFactory.Style; + +/** + * This class constructs ServiceBuilder objects. These objects are used to access the services and the data + * bindings to generate the wsdl. + */ +public final class DefaultServiceBuilderFactory extends ServiceBuilderFactory { + + @Override + public ServiceBuilder newBuilder(FrontendFactory.Style s) { + DataBinding dataBinding; + final String dbn = getDatabindingName(); + if (ToolConstants.JAXB_DATABINDING.equals(dbn)) { + dataBinding = new JAXBDataBinding(); + } else if (ToolConstants.AEGIS_DATABINDING.equals(dbn)) { + dataBinding = new AegisDatabinding(); + } else { + throw new ToolException("Unsupported databinding: " + s); + } + AbstractServiceFactory builder = null; + if (Style.Jaxws.equals(s)) { + builder = new JaxwsServiceBuilder(); + } else if (Style.Simple.equals(s)) { + builder = new SimpleServiceBuilder(); + } else { + throw new ToolException("Unsupported frontend style: " + s); + } + builder.setDataBinding(dataBinding); + builder.setServiceClass(serviceClass); + return builder; + } +} Copied: thirdparty/cxf/tags/cxf-2.2.6-patch-01/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java (from rev 12735, thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java) =================================================================== --- thirdparty/cxf/tags/cxf-2.2.6-patch-01/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java (rev 0) +++ thirdparty/cxf/tags/cxf-2.2.6-patch-01/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java 2010-08-04 19:47:08 UTC (rev 12736) @@ -0,0 +1,136 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.tools.java2wsdl.processor.internal; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.BusApplicationContext; +import org.apache.cxf.databinding.DataBinding; +import org.apache.cxf.frontend.AbstractServiceFactory; +import org.apache.cxf.service.ServiceBuilder; +import org.apache.cxf.tools.common.ToolConstants; +import org.apache.cxf.tools.common.ToolException; +import org.apache.cxf.tools.java2wsdl.processor.FrontendFactory; +import org.apache.cxf.tools.util.NameUtil; + +import org.springframework.beans.factory.BeanDefinitionStoreException; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.FileSystemResource; + +/** + * This class constructs ServiceBuilder objects using Spring. These objects are used to access the services + * and the data bindings to generate the wsdl. + */ +public final class SpringServiceBuilderFactory extends ServiceBuilderFactory { + + private List<String> beanDefinitions; + + public SpringServiceBuilderFactory(List<String> beanDefinitions) { + super(); + this.beanDefinitions = beanDefinitions; + } + + public SpringServiceBuilderFactory() { + super(); + this.beanDefinitions = new ArrayList<String>(0); + } + + /** + * Convert a parameter value to the name of a bean we'd use for a data binding. + * + * @param databindingName + * @return + */ + public static String databindingNameToBeanName(String dbName) { + return NameUtil.capitalize(dbName.toLowerCase()) + ToolConstants.DATABIND_BEAN_NAME_SUFFIX; + } + + @Override + public ServiceBuilder newBuilder(FrontendFactory.Style s) { + ApplicationContext applicationContext = getApplicationContext(beanDefinitions); + DataBinding dataBinding; + String databindingBeanName = databindingNameToBeanName(databindingName); + try { + dataBinding = (DataBinding)applicationContext.getBean(databindingBeanName); + } catch (RuntimeException e) { + throw new ToolException("Cannot get databinding bean " + databindingBeanName + + " for databinding " + databindingName); + } + + String beanName = getBuilderBeanName(s); + ServiceBuilder builder = null; + + try { + builder = (ServiceBuilder)applicationContext.getBean(beanName, ServiceBuilder.class); + AbstractServiceFactory serviceFactory = (AbstractServiceFactory)builder; + serviceFactory.setDataBinding(dataBinding); + } catch (RuntimeException e) { + throw new ToolException("Can not get ServiceBuilder bean " + beanName + + "to initialize the ServiceBuilder for style: " + s + " Reason: \n" + + e.getMessage(), e); + } + builder.setServiceClass(serviceClass); + return builder; + } + + /** + * Return the name of a prototype bean from Spring that can provide the service. The use of a bean allows + * for the possibility of an override. + * + * @param s Style of service + * @return name of bean. + */ + protected String getBuilderBeanName(FrontendFactory.Style s) { + return s + "ServiceBuilderBean"; + } + + /** + * This is factored out to permit use in a unit test. + * + * @param bus + * @return + */ + public static ApplicationContext getApplicationContext(List<String> additionalFilePathnames) { + BusApplicationContext busApplicationContext = BusFactory.getDefaultBus() + .getExtension(BusApplicationContext.class); + GenericApplicationContext appContext = new GenericApplicationContext(busApplicationContext); + XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(appContext); + reader.loadBeanDefinitions(new ClassPathResource("META-INF/cxf/java2wsbeans.xml")); + for (String pathname : additionalFilePathnames) { + try { + reader.loadBeanDefinitions(new FileSystemResource(pathname)); + } catch (BeanDefinitionStoreException bdse) { + throw new ToolException("Unable to open bean definition file " + pathname, bdse.getCause()); + } + } + + return appContext; + } + + public void setBeanDefinitions(List<String> beanDefinitions) { + this.beanDefinitions = beanDefinitions; + } + +}

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12735 - in thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test: java/org/apache/cxf/systest/soapfault and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: fnasser(a)redhat.com Date: 2010-08-04 15:21:42 -0400 (Wed, 04 Aug 2010) New Revision: 12735 Added: thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/ thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl Log: Fix problem that causes JTS tests to fail (Alessio Soldano) **Fix previous commit, add missing new files** Added: thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java 2010-08-04 19:21:42 UTC (rev 12735) @@ -0,0 +1,101 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.soapfault; + +import java.io.PrintStream; +import java.util.Map; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +/* + * This simple SOAPHandler will output the contents of incoming + * and outgoing messages. + */ +public class LoggingHandler implements SOAPHandler<SOAPMessageContext> { + + private PrintStream out; + + public LoggingHandler() { + setLogStream(System.out); + } + + protected final void setLogStream(PrintStream ps) { + out = ps; + } + + public void init(Map c) { + } + + public Set<QName> getHeaders() { + return null; + } + + public boolean handleMessage(SOAPMessageContext smc) { + //System.out.println("LoggingHandler : handleMessage Called...."); + logToSystemOut(smc); + return true; + } + + public boolean handleFault(SOAPMessageContext smc) { + //System.out.println("LoggingHandler : handleFault Called...."); + logToSystemOut(smc); + return true; + } + + // nothing to clean up + public void close(MessageContext messageContext) { + //System.out.println("LoggingHandler : close() Called...."); + } + + // nothing to clean up + public void destroy() { + //System.out.println("LoggingHandler : destroy() Called...."); + } + + /* + * Check the MESSAGE_OUTBOUND_PROPERTY in the context + * to see if this is an outgoing or incoming message. + * Write a brief message to the print stream and + * output the message. The writeTo() method can throw + * SOAPException or IOException + */ + protected void logToSystemOut(SOAPMessageContext smc) { + Boolean outboundProperty = (Boolean)smc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); + + if (outboundProperty.booleanValue()) { + //out.println("\nOutbound message:"); + } else { + //out.println("\nInbound message:"); + } + + SOAPMessage message = smc.getMessage(); + try { + message.writeTo(out); + //out.println(); + } catch (Exception e) { + //out.println("Exception in handler: " + e); + e.printStackTrace(); + } + } +} Added: thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java 2010-08-04 19:21:42 UTC (rev 12735) @@ -0,0 +1,38 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.systest.soapfault; + +import javax.jws.HandlerChain; +import javax.jws.WebService; + +import org.apache.cxf.soapfault.SoapFaultPortType; +import org.xmlsoap.schemas.soap.envelope.Fault; + +@WebService(endpointInterface = "org.apache.cxf.soapfault.SoapFaultPortType", + serviceName = "SoapFaultService") +@HandlerChain(file = "./handlers.xml", name = "TestHandlerChain") +public class SOAPFaultImpl implements SoapFaultPortType { + public void soapFault(Fault fault) { + System.out.println("Received soap fault message"); + System.out.println("FaultString: " + fault.getFaultstring()); + System.out.println("FaulCode: " + fault.getFaultcode()); + } + +} Added: thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java 2010-08-04 19:21:42 UTC (rev 12735) @@ -0,0 +1,55 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.soapfault; + +import javax.xml.namespace.QName; + +import org.apache.cxf.soapfault.SoapFaultPortType; +import org.apache.cxf.soapfault.SoapFaultService; +import org.apache.cxf.testutil.common.AbstractClientServerTestBase; + +import org.junit.BeforeClass; +import org.junit.Test; + +import org.xmlsoap.schemas.soap.envelope.Fault; + +public class SOAPFaultRequestTestCase extends AbstractClientServerTestBase { + private final QName portName = new QName("http://cxf.apache.org/soapfault", "SoapFaultPortType"); + + @BeforeClass + public static void startServers() throws Exception { + assertTrue("server did not launch correctly", launchServer(Server.class)); + } + + @Test + public void testSendSoapFaultRequest() throws Exception { + + SoapFaultService service = new SoapFaultService(); + assertNotNull(service); + + SoapFaultPortType soapFaultPort = service.getPort(portName, SoapFaultPortType.class); + + Fault fault = new Fault(); + fault.setFaultstring("ClientSetFaultString"); + fault.setFaultcode(new QName("http://cxf.apache.org/soapfault", "ClientSetError")); + soapFaultPort.soapFault(fault); + + } + +} Added: thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java 2010-08-04 19:21:42 UTC (rev 12735) @@ -0,0 +1,46 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.systest.soapfault; + +import javax.xml.ws.Endpoint; + +import org.apache.cxf.testutil.common.AbstractBusTestServerBase; + + +public class Server extends AbstractBusTestServerBase { + protected void run() { + String address = "http://localhost:9199/SoapFault"; + + Object implementor1 = new SOAPFaultImpl(); + Endpoint.publish(address, implementor1); + } + + public static void main(String[] args) { + try { + Server s = new Server(); + s.start(); + } catch (Exception ex) { + ex.printStackTrace(); + System.exit(-1); + } finally { + System.out.println("done!"); + } + } +} + Added: thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml 2010-08-04 19:21:42 UTC (rev 12735) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" +xmlns:cfg="http://cxf.apache.org/configuration/cfg" +xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://java.sun.com/xml/ns/javaee"> + <handler-chain> + <handler> + <handler-name>ph1</handler-name> + <handler-class>org.apache.cxf.systest.soapfault.LoggingHandler</handler-class> + <init-param> + <param-name>token</param-name> + <param-value>String</param-value> + </init-param> + </handler> + </handler-chain> +</handler-chains> Added: thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.6/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl 2010-08-04 19:21:42 UTC (rev 12735) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> + +<definitions + xmlns:s="http://www.w3.org/2001/XMLSchema" + xmlns:tns="http://cxf.apache.org/soapfault" + xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsaw="http://www.w3.org/2006/02/addressing/wsdl" + targetNamespace="http://cxf.apache.org/soapfault" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <s:schema> + <s:import namespace="http://schemas.xmlsoap.org/soap/envelope/" + schemaLocation="http://schemas.xmlsoap.org/soap/envelope/"/> + </s:schema> + </types> + <message name="SoapFault"> + <part name="fault" element="soapenv:Fault" /> + </message> + + + + <portType name="SoapFaultPortType"> + <operation name="SoapFault"> + <input name="SoapFault" message="tns:SoapFault" /> + </operation> + </portType> + + + + <binding name="SoapFault_SOAPBinding" type="tns:SoapFaultPortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="SoapFault"> + <input message="tns:Soapfault"> + <soap:body use="literal"/> + </input> + </operation> + </binding> + + <service name="SoapFaultService"> + <port binding="tns:SoapFault_SOAPBinding" name="SoapFaultPortType"> + <wsaw:UsingAddressing required="true"/> + <soap:address location="http://localhost:9199/SoapFault"/> + </port> + </service> +</definitions>

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12734 - thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal.

by jbossws-commits＠lists.jboss.org

Author: fnasser(a)redhat.com Date: 2010-08-04 15:16:21 -0400 (Wed, 04 Aug 2010) New Revision: 12734 Added: thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java Log: Make use of Spring optional in CXF's JAXWS tooling (Alessio Soldano) **FIX commit mistake, missing new files** Added: thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/DefaultServiceBuilderFactory.java 2010-08-04 19:16:21 UTC (rev 12734) @@ -0,0 +1,63 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.tools.java2wsdl.processor.internal; + +import org.apache.cxf.aegis.databinding.AegisDatabinding; +import org.apache.cxf.databinding.DataBinding; +import org.apache.cxf.frontend.AbstractServiceFactory; +import org.apache.cxf.jaxb.JAXBDataBinding; +import org.apache.cxf.jaxws.JaxwsServiceBuilder; +import org.apache.cxf.service.ServiceBuilder; +import org.apache.cxf.simple.SimpleServiceBuilder; +import org.apache.cxf.tools.common.ToolConstants; +import org.apache.cxf.tools.common.ToolException; +import org.apache.cxf.tools.java2wsdl.processor.FrontendFactory; +import org.apache.cxf.tools.java2wsdl.processor.FrontendFactory.Style; + +/** + * This class constructs ServiceBuilder objects. These objects are used to access the services and the data + * bindings to generate the wsdl. + */ +public final class DefaultServiceBuilderFactory extends ServiceBuilderFactory { + + @Override + public ServiceBuilder newBuilder(FrontendFactory.Style s) { + DataBinding dataBinding; + final String dbn = getDatabindingName(); + if (ToolConstants.JAXB_DATABINDING.equals(dbn)) { + dataBinding = new JAXBDataBinding(); + } else if (ToolConstants.AEGIS_DATABINDING.equals(dbn)) { + dataBinding = new AegisDatabinding(); + } else { + throw new ToolException("Unsupported databinding: " + s); + } + AbstractServiceFactory builder = null; + if (Style.Jaxws.equals(s)) { + builder = new JaxwsServiceBuilder(); + } else if (Style.Simple.equals(s)) { + builder = new SimpleServiceBuilder(); + } else { + throw new ToolException("Unsupported frontend style: " + s); + } + builder.setDataBinding(dataBinding); + builder.setServiceClass(serviceClass); + return builder; + } +} Added: thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.6/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/SpringServiceBuilderFactory.java 2010-08-04 19:16:21 UTC (rev 12734) @@ -0,0 +1,136 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.tools.java2wsdl.processor.internal; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.BusApplicationContext; +import org.apache.cxf.databinding.DataBinding; +import org.apache.cxf.frontend.AbstractServiceFactory; +import org.apache.cxf.service.ServiceBuilder; +import org.apache.cxf.tools.common.ToolConstants; +import org.apache.cxf.tools.common.ToolException; +import org.apache.cxf.tools.java2wsdl.processor.FrontendFactory; +import org.apache.cxf.tools.util.NameUtil; + +import org.springframework.beans.factory.BeanDefinitionStoreException; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.FileSystemResource; + +/** + * This class constructs ServiceBuilder objects using Spring. These objects are used to access the services + * and the data bindings to generate the wsdl. + */ +public final class SpringServiceBuilderFactory extends ServiceBuilderFactory { + + private List<String> beanDefinitions; + + public SpringServiceBuilderFactory(List<String> beanDefinitions) { + super(); + this.beanDefinitions = beanDefinitions; + } + + public SpringServiceBuilderFactory() { + super(); + this.beanDefinitions = new ArrayList<String>(0); + } + + /** + * Convert a parameter value to the name of a bean we'd use for a data binding. + * + * @param databindingName + * @return + */ + public static String databindingNameToBeanName(String dbName) { + return NameUtil.capitalize(dbName.toLowerCase()) + ToolConstants.DATABIND_BEAN_NAME_SUFFIX; + } + + @Override + public ServiceBuilder newBuilder(FrontendFactory.Style s) { + ApplicationContext applicationContext = getApplicationContext(beanDefinitions); + DataBinding dataBinding; + String databindingBeanName = databindingNameToBeanName(databindingName); + try { + dataBinding = (DataBinding)applicationContext.getBean(databindingBeanName); + } catch (RuntimeException e) { + throw new ToolException("Cannot get databinding bean " + databindingBeanName + + " for databinding " + databindingName); + } + + String beanName = getBuilderBeanName(s); + ServiceBuilder builder = null; + + try { + builder = (ServiceBuilder)applicationContext.getBean(beanName, ServiceBuilder.class); + AbstractServiceFactory serviceFactory = (AbstractServiceFactory)builder; + serviceFactory.setDataBinding(dataBinding); + } catch (RuntimeException e) { + throw new ToolException("Can not get ServiceBuilder bean " + beanName + + "to initialize the ServiceBuilder for style: " + s + " Reason: \n" + + e.getMessage(), e); + } + builder.setServiceClass(serviceClass); + return builder; + } + + /** + * Return the name of a prototype bean from Spring that can provide the service. The use of a bean allows + * for the possibility of an override. + * + * @param s Style of service + * @return name of bean. + */ + protected String getBuilderBeanName(FrontendFactory.Style s) { + return s + "ServiceBuilderBean"; + } + + /** + * This is factored out to permit use in a unit test. + * + * @param bus + * @return + */ + public static ApplicationContext getApplicationContext(List<String> additionalFilePathnames) { + BusApplicationContext busApplicationContext = BusFactory.getDefaultBus() + .getExtension(BusApplicationContext.class); + GenericApplicationContext appContext = new GenericApplicationContext(busApplicationContext); + XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(appContext); + reader.loadBeanDefinitions(new ClassPathResource("META-INF/cxf/java2wsbeans.xml")); + for (String pathname : additionalFilePathnames) { + try { + reader.loadBeanDefinitions(new FileSystemResource(pathname)); + } catch (BeanDefinitionStoreException bdse) { + throw new ToolException("Unable to open bean definition file " + pathname, bdse.getCause()); + } + } + + return appContext; + } + + public void setBeanDefinitions(List<String> beanDefinitions) { + this.beanDefinitions = beanDefinitions; + } + +}

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12733 - stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-08-04 10:12:44 -0400 (Wed, 04 Aug 2010) New Revision: 12733 Modified: stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java Log: Use CXF 2.3 api when building AssertionBuilderRegistry and PolicyInterceptorProviderRegistry 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:52:11 UTC (rev 12732) +++ stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-04 14:12:44 UTC (rev 12733) @@ -103,10 +103,8 @@ 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); + AssertionBuilderRegistry assertionBuilderRegistry = new AssertionBuilderRegistryImpl(bus); + PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl(bus); PolicyBuilderImpl policyBuilder = new PolicyBuilderImpl(); policyBuilder.setBus(bus); policyBuilder.setAssertionBuilderRegistry(assertionBuilderRegistry);

15 years, 9 months

1
0
0 / 0

JBossWS SVN: r12732 - in stack/cxf/branches/cxf-2.3/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 12 other directories.

by jbossws-commits＠lists.jboss.org

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> +  + <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> +  </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> - * <complexType name="echo"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </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> + * <complexType name="echo"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </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> - * <complexType name="echoResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </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> + * <complexType name="echoResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </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> - * <complexType name="ping"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </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> + * <complexType name="ping"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </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" -) -@InInterceptors(interceptors="org.jboss.test.ws.jaxws.samples.wsrm.service.RMCheckInterceptor") -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" +) +@InInterceptors(interceptors="org.jboss.test.ws.jaxws.samples.wsrm.service.RMCheckInterceptor") +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"> -<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"> +<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/**

15 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2010