jbossws-commits May 2007

jbossws-commits@lists.jboss.org

1 participants
395 discussions

JBossWS SVN: r3125 - in branches/tdiesler/trunk: build/ant-import and 20 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-17 17:45:05 -0400 (Thu, 17 May 2007) New Revision: 3125 Added: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss42.xml branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss50.xml branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss42.xml branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss50.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss42.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss50.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/META-INF/ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/jbossws.beans/ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws50.sar/ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws50.sar/META-INF/ branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss42.txt branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss50.txt Removed: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jbws-jboss42/build.xml branches/tdiesler/trunk/integration/jbws-jboss42/src/main/etc/component-info.xml branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.sar/ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws50.sar/META-INF/ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/ branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes.txt Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml branches/tdiesler/trunk/build/ant-import/build-testsuite.xml branches/tdiesler/trunk/build/build.xml branches/tdiesler/trunk/integration/jboss42/build.xml branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/jbws-jboss50/build.xml branches/tdiesler/trunk/integration/sunri-jboss50/build.xml Log: Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -23,10 +23,8 @@ <property name="testsuite.dir" value="${basedir}/testsuite"/> <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/> <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> - <property name="int.jbws50.dir" value="${basedir}/integration/jbws-jboss50"/> - <property name="int.jbws42.dir" value="${basedir}/integration/jbws-jboss42"/> - <property name="int.sunri50.dir" value="${basedir}/integration/sunri-jboss50"/> - <property name="int.sunri42.dir" value="${basedir}/integration/sunri-jboss42"/> + <property name="int.jbws.dir" value="${basedir}/integration/jbws-jboss50"/> + <property name="int.sunri.dir" value="${basedir}/integration/sunri-jboss50"/> <property file="${build.dir}/ant.properties"/> <property file="${build.dir}/version.properties"/> Modified: branches/tdiesler/trunk/build/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-testsuite.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/build/ant-import/build-testsuite.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -71,7 +71,7 @@ <isset property="jboss.home"/> </condition> - <fail message="Excludes file not set. Please run the testsuite from any of the integration projects" unless="excludesfile"/> + <fail message="Excludes file not set. Run tests-jboss50 or tests-jboss42" unless="excludesfile"/> <echo/> <echo message="-----------------------------------------------"/> Modified: branches/tdiesler/trunk/build/build.xml =================================================================== --- branches/tdiesler/trunk/build/build.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/build/build.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -41,7 +41,8 @@ <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${int.sunri50.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${int.jbws.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/> </target> <target name="clobber" depends="prepare" description="Cleans up all generated files."> @@ -49,7 +50,8 @@ <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/> - <ant antfile="${int.sunri50.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${int.jbws.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/> </target> <target name="main" description="Executes the default target (most)." depends="jars"> @@ -64,7 +66,8 @@ <ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="most" inheritall="false"/> - <ant antfile="${int.sunri50.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${int.jbws.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/> </target> <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist,build-src-dist"> Modified: branches/tdiesler/trunk/integration/jboss42/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/build.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jboss42/build.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -60,6 +60,7 @@ <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/**"/> + <exclude name="org/jboss/ws/integration/jboss42/jms/**"/> <classpath refid="jbws42.integration.classpath"/> </javac> </target> Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms) Deleted: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java 2007-05-16 14:57:48 UTC (rev 3110) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,149 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jms; - -// $Id:JMSMessageDispatcher.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ - -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.rmi.RemoteException; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.util.NotImplementedException; -import org.jboss.ws.WSException; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.MessageAbstraction; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.server.legacy.ServiceEndpoint; -import org.jboss.ws.core.server.legacy.ServiceEndpointInvoker; -import org.jboss.ws.core.server.legacy.ServiceEndpointManager; -import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; - -/** - * A dispatcher for SOAPMessages - * - * @author Thomas.Diesler(a)jboss.org - */ -public class JMSMessageDispatcher implements JMSMessageDispatcherMBean -{ - // logging support - protected Logger log = Logger.getLogger(JMSMessageDispatcher.class); - - /** Dispatch the message to the underlying SOAP engine - */ - public SOAPMessage dipatchMessage(String fromName, Object targetBean, InputStream reqMessage) throws RemoteException - { - ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); - ServiceEndpointManager epManager = factory.getServiceEndpointManager(); - ObjectName sepID = getServiceEndpointForDestination(epManager, fromName); - - if (sepID == null) - throw new WSException("Cannot find serviceID for: " + fromName); - - log.debug("dipatchMessage: " + sepID); - - // Setup the MDB invoker - ServiceEndpoint sep = epManager.getServiceEndpointByID(sepID); - ServerEndpointMetaData sepMetaData = sep.getServiceEndpointInfo().getServerEndpointMetaData(); - - ServiceEndpointInvoker invoker = sep.getServiceEndpointInfo().getInvoker(); - if (invoker instanceof ServiceEndpointInvokerMDB) - { - ServiceEndpointInvokerMDB mdbInvoker = (ServiceEndpointInvokerMDB)invoker; - mdbInvoker.setTargetBeanObject(targetBean); - } - - // Associate a message context with the current thread - CommonMessageContext msgContext = new SOAPMessageContextJAXRPC(); - MessageContextAssociation.pushMessageContext(msgContext); - msgContext.setEndpointMetaData(sepMetaData); - - SOAPMessage resMessage = null; - try - { - // Process the request message and return the already serialized response - // Legacy implementations of the JMSTransportSupport dont provide a msg - // context which is needed for serialization. - resMessage = (SOAPMessage)sep.processRequest(null, null, reqMessage); - resMessage.writeTo(new ByteArrayOutputStream()); - return resMessage; - } - catch (Exception ex) - { - WSException.rethrow("Cannot process SOAP request", ex); - } - finally - { - MessageContextAssociation.popMessageContext(); - } - - return resMessage; - } - - /** Dispatch the message to the underlying SOAP engine - */ - public SOAPMessage delegateMessage(String serviceID, InputStream soapMessage) throws RemoteException - { - throw new NotImplementedException(); - } - - // The destination jndiName is encoded in the service object name under key 'jms' - private ObjectName getServiceEndpointForDestination(ServiceEndpointManager epManager, String fromName) - { - ObjectName sepID = null; - for (ObjectName aux : epManager.getServiceEndpoints()) - { - String jmsProp = aux.getKeyProperty("jms"); - if (jmsProp != null && jmsProp.equals(fromName)) - { - sepID = aux; - break; - } - } - return sepID; - } - - public void create() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - { - server.registerMBean(this, OBJECT_NAME); - } - } - - public void destroy() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - { - server.unregisterMBean(OBJECT_NAME); - } - } -} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java (from rev 3124, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcher.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,149 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.jms; + +// $Id:JMSMessageDispatcher.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.rmi.RemoteException; + +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.util.NotImplementedException; +import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.MessageAbstraction; +import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; +import org.jboss.ws.core.server.legacy.ServiceEndpoint; +import org.jboss.ws.core.server.legacy.ServiceEndpointInvoker; +import org.jboss.ws.core.server.legacy.ServiceEndpointManager; +import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; + +/** + * A dispatcher for SOAPMessages + * + * @author Thomas.Diesler(a)jboss.org + */ +public class JMSMessageDispatcher implements JMSMessageDispatcherMBean +{ + // logging support + protected Logger log = Logger.getLogger(JMSMessageDispatcher.class); + + /** Dispatch the message to the underlying SOAP engine + */ + public SOAPMessage dipatchMessage(String fromName, Object targetBean, InputStream reqMessage) throws RemoteException + { + ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); + ServiceEndpointManager epManager = factory.getServiceEndpointManager(); + ObjectName sepID = getServiceEndpointForDestination(epManager, fromName); + + if (sepID == null) + throw new WSException("Cannot find serviceID for: " + fromName); + + log.debug("dipatchMessage: " + sepID); + + // Setup the MDB invoker + ServiceEndpoint sep = epManager.getServiceEndpointByID(sepID); + ServerEndpointMetaData sepMetaData = sep.getServiceEndpointInfo().getServerEndpointMetaData(); + + ServiceEndpointInvoker invoker = sep.getServiceEndpointInfo().getInvoker(); + if (invoker instanceof ServiceEndpointInvokerMDB) + { + ServiceEndpointInvokerMDB mdbInvoker = (ServiceEndpointInvokerMDB)invoker; + mdbInvoker.setTargetBeanObject(targetBean); + } + + // Associate a message context with the current thread + CommonMessageContext msgContext = new SOAPMessageContextJAXRPC(); + MessageContextAssociation.pushMessageContext(msgContext); + msgContext.setEndpointMetaData(sepMetaData); + + SOAPMessage resMessage = null; + try + { + // Process the request message and return the already serialized response + // Legacy implementations of the JMSTransportSupport dont provide a msg + // context which is needed for serialization. + resMessage = (SOAPMessage)sep.processRequest(null, null, reqMessage); + resMessage.writeTo(new ByteArrayOutputStream()); + return resMessage; + } + catch (Exception ex) + { + WSException.rethrow("Cannot process SOAP request", ex); + } + finally + { + MessageContextAssociation.popMessageContext(); + } + + return resMessage; + } + + /** Dispatch the message to the underlying SOAP engine + */ + public SOAPMessage delegateMessage(String serviceID, InputStream soapMessage) throws RemoteException + { + throw new NotImplementedException(); + } + + // The destination jndiName is encoded in the service object name under key 'jms' + private ObjectName getServiceEndpointForDestination(ServiceEndpointManager epManager, String fromName) + { + ObjectName sepID = null; + for (ObjectName aux : epManager.getServiceEndpoints()) + { + String jmsProp = aux.getKeyProperty("jms"); + if (jmsProp != null && jmsProp.equals(fromName)) + { + sepID = aux; + break; + } + } + return sepID; + } + + public void create() throws Exception + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } +} Deleted: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java 2007-05-16 14:57:48 UTC (rev 3110) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,28 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jms; - -// $Id:JMSMessageDispatcher.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ - -public interface JMSMessageDispatcherMBean extends MessageDispatcher -{ -} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java (from rev 3124, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSMessageDispatcherMBean.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,28 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.jms; + +// $Id:JMSMessageDispatcher.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +public interface JMSMessageDispatcherMBean extends MessageDispatcher +{ +} Deleted: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java 2007-05-16 14:57:48 UTC (rev 3110) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,241 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jms; - -// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.rmi.RemoteException; - -import javax.ejb.EJBException; -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; -import javax.jms.BytesMessage; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.naming.InitialContext; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; -import org.jboss.util.NestedRuntimeException; - -/** - * The abstract base class for MDBs that want to act as web service endpoints. - * A subclass should only need to implement the service endpoint interface. - * - * @author Thomas.Diesler(a)jboss.org - */ -public abstract class JMSTransportSupport implements MessageDrivenBean, MessageListener -{ - // logging support - protected Logger log = Logger.getLogger(JMSTransportSupport.class); - - //private MessageDrivenContext mdbCtx; - private QueueConnectionFactory queueFactory; - - /** - * All messages come in here, if it is a BytesMessage we pass it on for further processing. - */ - public void onMessage(Message message) - { - try - { - String msgStr = null; - if (message instanceof BytesMessage) - { - msgStr = getMessageStr((BytesMessage)message); - } - else if (message instanceof TextMessage) - { - msgStr = ((TextMessage)message).getText(); - } - else - { - log.warn("Invalid message type: " + message); - return; - } - - log.debug("Incomming SOAP message: " + msgStr); - - String fromName = null; - Destination destination = message.getJMSDestination(); - if (destination instanceof Queue) - fromName = "queue/" + ((Queue)destination).getQueueName(); - if (destination instanceof Topic) - fromName = "topic/" + ((Topic)destination).getTopicName(); - - InputStream reqMessage = new ByteArrayInputStream(msgStr.getBytes()); - SOAPMessage resMessage = processSOAPMessage(fromName, reqMessage); - - if (resMessage != null) - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - resMessage.writeTo(baos); - - msgStr = new String(baos.toByteArray()); - log.debug("Outgoing SOAP message: " + msgStr); - - Queue replyQueue = getReplyQueue(message); - if (replyQueue != null) - { - sendResponse(replyQueue, msgStr); - } - else - { - log.warn("No reply queue, ignore response message"); - } - } - else - { - log.debug("SOAP response message is null"); - } - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new EJBException(e); - } - } - - protected SOAPMessage processSOAPMessage(String fromName, InputStream reqMessage) throws SOAPException, IOException, RemoteException - { - MessageDispatcher msgDispatcher = new JMSMessageDispatcher(); - SOAPMessage resMessage = msgDispatcher.dipatchMessage(fromName, this, reqMessage); - return resMessage; - } - - private String getMessageStr(BytesMessage message) throws Exception - { - byte[] buffer = new byte[8 * 1024]; - ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.length); - int read = message.readBytes(buffer); - while (read != -1) - { - out.write(buffer, 0, read); - read = message.readBytes(buffer); - } - - byte[] msgBytes = out.toByteArray(); - return new String(msgBytes); - } - - /** - * Get the reply queue. - */ - protected Queue getReplyQueue(Message message) throws JMSException - { - Queue replyQueue = (Queue)message.getJMSReplyTo(); - return replyQueue; - } - - /** - * Respond to the call by sending a message to the reply queue - */ - protected void sendResponse(Queue replyQueue, String msgStr) throws SOAPException, IOException, JMSException - { - QueueConnection qc = queueFactory.createQueueConnection(); - QueueSession session = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - QueueSender sender = null; - try - { - sender = session.createSender(replyQueue); - TextMessage responseMessage = session.createTextMessage(msgStr); - sender.send(responseMessage); - log.info("Sent response"); - } - finally - { - try - { - sender.close(); - } - catch (JMSException ignored) - { - } - try - { - session.close(); - } - catch (JMSException ignored) - { - } - try - { - qc.close(); - } - catch (JMSException ignored) - { - } - } - } - - // MDB lifecycle methods ******************************************************************************************** - - public void ejbCreate() - { - try - { - InitialContext ctx = new InitialContext(); - queueFactory = (QueueConnectionFactory)ctx.lookup("java:/ConnectionFactory"); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new NestedRuntimeException(e); - } - } - - /** - * A container invokes this method before it ends the life of the message-driven object. - */ - public void ejbRemove() throws EJBException - { - } - - /** - * Set the associated message-driven context. - */ - public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException - { - //this.mdbCtx = ctx; - } -} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java (from rev 3124, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/JMSTransportSupport.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,241 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.jms; + +// $Id:JMSTransportSupport.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.rmi.RemoteException; + +import javax.ejb.EJBException; +import javax.ejb.MessageDrivenBean; +import javax.ejb.MessageDrivenContext; +import javax.jms.BytesMessage; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.QueueSender; +import javax.jms.QueueSession; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.naming.InitialContext; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; +import org.jboss.util.NestedRuntimeException; + +/** + * The abstract base class for MDBs that want to act as web service endpoints. + * A subclass should only need to implement the service endpoint interface. + * + * @author Thomas.Diesler(a)jboss.org + */ +public abstract class JMSTransportSupport implements MessageDrivenBean, MessageListener +{ + // logging support + protected Logger log = Logger.getLogger(JMSTransportSupport.class); + + //private MessageDrivenContext mdbCtx; + private QueueConnectionFactory queueFactory; + + /** + * All messages come in here, if it is a BytesMessage we pass it on for further processing. + */ + public void onMessage(Message message) + { + try + { + String msgStr = null; + if (message instanceof BytesMessage) + { + msgStr = getMessageStr((BytesMessage)message); + } + else if (message instanceof TextMessage) + { + msgStr = ((TextMessage)message).getText(); + } + else + { + log.warn("Invalid message type: " + message); + return; + } + + log.debug("Incomming SOAP message: " + msgStr); + + String fromName = null; + Destination destination = message.getJMSDestination(); + if (destination instanceof Queue) + fromName = "queue/" + ((Queue)destination).getQueueName(); + if (destination instanceof Topic) + fromName = "topic/" + ((Topic)destination).getTopicName(); + + InputStream reqMessage = new ByteArrayInputStream(msgStr.getBytes()); + SOAPMessage resMessage = processSOAPMessage(fromName, reqMessage); + + if (resMessage != null) + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + resMessage.writeTo(baos); + + msgStr = new String(baos.toByteArray()); + log.debug("Outgoing SOAP message: " + msgStr); + + Queue replyQueue = getReplyQueue(message); + if (replyQueue != null) + { + sendResponse(replyQueue, msgStr); + } + else + { + log.warn("No reply queue, ignore response message"); + } + } + else + { + log.debug("SOAP response message is null"); + } + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new EJBException(e); + } + } + + protected SOAPMessage processSOAPMessage(String fromName, InputStream reqMessage) throws SOAPException, IOException, RemoteException + { + MessageDispatcher msgDispatcher = new JMSMessageDispatcher(); + SOAPMessage resMessage = msgDispatcher.dipatchMessage(fromName, this, reqMessage); + return resMessage; + } + + private String getMessageStr(BytesMessage message) throws Exception + { + byte[] buffer = new byte[8 * 1024]; + ByteArrayOutputStream out = new ByteArrayOutputStream(buffer.length); + int read = message.readBytes(buffer); + while (read != -1) + { + out.write(buffer, 0, read); + read = message.readBytes(buffer); + } + + byte[] msgBytes = out.toByteArray(); + return new String(msgBytes); + } + + /** + * Get the reply queue. + */ + protected Queue getReplyQueue(Message message) throws JMSException + { + Queue replyQueue = (Queue)message.getJMSReplyTo(); + return replyQueue; + } + + /** + * Respond to the call by sending a message to the reply queue + */ + protected void sendResponse(Queue replyQueue, String msgStr) throws SOAPException, IOException, JMSException + { + QueueConnection qc = queueFactory.createQueueConnection(); + QueueSession session = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); + QueueSender sender = null; + try + { + sender = session.createSender(replyQueue); + TextMessage responseMessage = session.createTextMessage(msgStr); + sender.send(responseMessage); + log.info("Sent response"); + } + finally + { + try + { + sender.close(); + } + catch (JMSException ignored) + { + } + try + { + session.close(); + } + catch (JMSException ignored) + { + } + try + { + qc.close(); + } + catch (JMSException ignored) + { + } + } + } + + // MDB lifecycle methods ******************************************************************************************** + + public void ejbCreate() + { + try + { + InitialContext ctx = new InitialContext(); + queueFactory = (QueueConnectionFactory)ctx.lookup("java:/ConnectionFactory"); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new NestedRuntimeException(e); + } + } + + /** + * A container invokes this method before it ends the life of the message-driven object. + */ + public void ejbRemove() throws EJBException + { + } + + /** + * Set the associated message-driven context. + */ + public void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException + { + //this.mdbCtx = ctx; + } +} Deleted: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java 2007-05-16 14:57:48 UTC (rev 3110) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jms; - -// $Id:MessageDispatcher.java 898 2006-09-05 08:23:03Z thomas.diesler(a)jboss.com $ - -import java.io.InputStream; -import java.rmi.RemoteException; - -import javax.management.ObjectName; -import javax.xml.soap.SOAPMessage; - -import org.jboss.ws.integration.ObjectNameFactory; - -/** - * A dispatcher for SOAPMessages - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-Feb-2006 - */ -public interface MessageDispatcher -{ - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=JMSTransportSupport"); - - /** Dispatch the message to the underlying SOAP engine - */ - SOAPMessage dipatchMessage(String fromName, Object targetImplBean, InputStream reqMessage) throws RemoteException; - - /** Dispatch the message to the underlying SOAP engine - */ - SOAPMessage delegateMessage(String serviceID, InputStream reqMessage) throws RemoteException; -} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java (from rev 3124, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/MessageDispatcher.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.jms; + +// $Id:MessageDispatcher.java 898 2006-09-05 08:23:03Z thomas.diesler(a)jboss.com $ + +import java.io.InputStream; +import java.rmi.RemoteException; + +import javax.management.ObjectName; +import javax.xml.soap.SOAPMessage; + +import org.jboss.ws.integration.ObjectNameFactory; + +/** + * A dispatcher for SOAPMessages + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-Feb-2006 + */ +public interface MessageDispatcher +{ + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=JMSTransportSupport"); + + /** Dispatch the message to the underlying SOAP engine + */ + SOAPMessage dipatchMessage(String fromName, Object targetImplBean, InputStream reqMessage) throws RemoteException; + + /** Dispatch the message to the underlying SOAP engine + */ + SOAPMessage delegateMessage(String serviceID, InputStream reqMessage) throws RemoteException; +} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java 2007-05-16 14:57:48 UTC (rev 3110) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,94 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jms; - -// $Id$ - -import java.lang.reflect.Method; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.EndpointInvocation; -import org.jboss.ws.core.server.legacy.AbstractServiceEndpointInvoker; -import org.jboss.ws.core.server.legacy.ServiceEndpointInvoker; -import org.jboss.ws.core.utils.ThreadLocalAssociation; - -/** - * Handles invocations on MDB endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mar-2006 - */ -public class ServiceEndpointInvokerMDB extends AbstractServiceEndpointInvoker implements ServiceEndpointInvoker -{ - // provide logging - private Logger log = Logger.getLogger(ServiceEndpointInvokerMDB.class); - - /** Load the SEI implementation bean if necessary - */ - public Class loadServiceEndpoint() throws ClassNotFoundException - { - return null; - } - - // The dispatcher sets the target bean object - public void setTargetBeanObject(Object targetMDB) - { - ThreadLocalAssociation.localInvokerMDBAssoc().set(targetMDB); - } - - /** Create an instance of the SEI implementation bean if necessary - */ - public Object createServiceEndpointInstance(Object endpointContext, Class seiImplClass) throws InstantiationException, IllegalAccessException - { - return ThreadLocalAssociation.localInvokerMDBAssoc().get(); - } - - /** Invoke an instance of the SEI implementation bean */ - public void invokeServiceEndpointInstance(Object seiImpl, EndpointInvocation epInv) throws Exception - { - log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); - try - { - Class implClass = seiImpl.getClass(); - Method seiMethod = epInv.getJavaMethod(); - Method implMethod = getImplMethod(implClass, seiMethod); - - Object[] args = epInv.getRequestPayload(); - Object retObj = implMethod.invoke(seiImpl, args); - epInv.setReturnValue(retObj); - } - catch (Exception e) - { - handleInvocationException(e); - } - finally - { - // cleanup thread local - setTargetBeanObject(null); - } - } - - /** Destroy an instance of the SEI implementation bean if necessary */ - public void destroyServiceEndpointInstance(Object seiImpl) - { - } -} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java (from rev 3124, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ServiceEndpointInvokerMDB.java 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,94 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.jms; + +// $Id$ + +import java.lang.reflect.Method; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.server.legacy.AbstractServiceEndpointInvoker; +import org.jboss.ws.core.server.legacy.ServiceEndpointInvoker; +import org.jboss.ws.core.utils.ThreadLocalAssociation; + +/** + * Handles invocations on MDB endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Mar-2006 + */ +public class ServiceEndpointInvokerMDB extends AbstractServiceEndpointInvoker implements ServiceEndpointInvoker +{ + // provide logging + private Logger log = Logger.getLogger(ServiceEndpointInvokerMDB.class); + + /** Load the SEI implementation bean if necessary + */ + public Class loadServiceEndpoint() throws ClassNotFoundException + { + return null; + } + + // The dispatcher sets the target bean object + public void setTargetBeanObject(Object targetMDB) + { + ThreadLocalAssociation.localInvokerMDBAssoc().set(targetMDB); + } + + /** Create an instance of the SEI implementation bean if necessary + */ + public Object createServiceEndpointInstance(Object endpointContext, Class seiImplClass) throws InstantiationException, IllegalAccessException + { + return ThreadLocalAssociation.localInvokerMDBAssoc().get(); + } + + /** Invoke an instance of the SEI implementation bean */ + public void invokeServiceEndpointInstance(Object seiImpl, EndpointInvocation epInv) throws Exception + { + log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); + try + { + Class implClass = seiImpl.getClass(); + Method seiMethod = epInv.getJavaMethod(); + Method implMethod = getImplMethod(implClass, seiMethod); + + Object[] args = epInv.getRequestPayload(); + Object retObj = implMethod.invoke(seiImpl, args); + epInv.setReturnValue(retObj); + } + catch (Exception e) + { + handleInvocationException(e); + } + finally + { + // cleanup thread local + setTargetBeanObject(null); + } + } + + /** Destroy an instance of the SEI implementation bean if necessary */ + public void destroyServiceEndpointInstance(Object seiImpl) + { + } +} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - -  - <target name="deploy" depends="jars,undeploy" description="Deploy jbossws"> - - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - - <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/lib" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws42.output.lib.dir}/jbossws-jbws42.sar"/> - </target> - -  - <target name="undeploy" depends="prepare" description="Remove jbossws"> - - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - - <delete> - <fileset dir="${jboss42.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/>  - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  - <target name="release" depends="jars" - description="Release to jboss.local.repository"> - -  - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> - <fileset dir="${jbws42.output.lib.dir}"> - <include name="jbossws-jboss42.jar"/> - <include name="jbossws42.sar"/> - <include name="jbossws42-src.zip"/> - </fileset> - </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${int.jbws42.dir}/version.properties"/> - </filterset> - </copy> - - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - - <property name="tests.dir" value="${int.jbws42.dir}/src/test"/> - <property name="tests.output.dir" value="${int.jbws42.dir}/output-tests"/> - - <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${int.jbws42.dir}/src/test/resources/excludes.txt"/> - - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - -  - <target name="tests-init" depends="tests-prepare"> - - <path id="jbossws.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - </path> - -  - <path id="javac.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${jboss.client}/jboss-common-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> - </path> - -  - <path id="tests.client.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <path refid="javac.classpath"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${testsuite.dir}/src/java"/> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.jbws42.dir}/src/test"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> - </target> - - <target name="thirdparty-init" depends="prepare"/> - -  - <target name="thirdparty-get" depends="thirdparty-init" - description="Gets the thirdparty libraries"/> - - <target name="thirdparty-classpath" depends="thirdparty-get"> - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/build.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss42/build.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="../.." name="JBossWS-JBoss42"> - - <import file="${basedir}/build/ant-import/build-setup.xml"/> - - <import file="${int.jbws42.dir}/ant-import/build-deploy.xml"/> - <import file="${int.jbws42.dir}/ant-import/build-release.xml"/> - <import file="${int.jbws42.dir}/ant-import/build-thirdparty.xml"/> - <import file="${int.jbws42.dir}/ant-import/build-testsuite.xml"/> - -  -  -  - - <property name="jbws42.dir" value="${int.jbws42.dir}"/> - <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/> - <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/> - <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/> - <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/> - <property name="jbws42.output.dir" value="${jbws42.dir}/output"/> - <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/> - <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/> - <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/> - -  -  -  - - <target name="init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <ant antfile="${int.jboss42.dir}/build.xml" target="main" inheritall="false"/> - <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/> - </target> - -  -  -  - -  - - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - -  - <target name="compile-classes" depends="init"> - <mkdir dir="${jbws42.output.classes.dir}"/> - <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <exclude name="org/jboss/ws/integration/jboss42/jms/**"/> - <include name="org/jboss/ws/integration/jboss42/**"/> - <classpath refid="jbws42.integration.classpath"/> - </javac> - </target> - -  - <target name="compile-etc" depends="init"> - <mkdir dir="${jbws42.output.etc.dir}"/> - <copy todir="${jbws42.output.etc.dir}" filtering="yes"> - <fileset dir="${jbws42.etc.dir}"> - <include name="component-info.xml"/> - </fileset> - <fileset dir="${build.dir}/etc"> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> - </target> - -  -  -  - -  - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> - </target> - -  - <target name="module-jars" depends="init"> - -  - <mkdir dir="${jbws42.output.lib.dir}"/> - <jar jarfile="${jbws42.output.lib.dir}/jbossws-jbws42.jar" manifest="${jbws42.output.etc.dir}/default.mf"> - <fileset dir="${jbws42.output.classes.dir}"> - <include name="org/jboss/ws/integration/jboss42/**"/> - </fileset> - </jar> - -  - <war warfile="${jbws42.output.lib.dir}/jbossws-jbws42-context.war" webxml="${jbws42.resources.dir}/jbossws.war/WEB-INF/web.xml"> - <fileset dir="${jbws42.resources.dir}/jbossws.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <webinf dir="${jbws42.resources.dir}/jbossws.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <jar jarfile="${jbws42.output.lib.dir}/jbossws-jbws42.sar" manifest="${jbws42.output.etc.dir}/default.mf"> - <fileset dir="${int.jboss42.dir}/output/lib"> - <include name="jbossws-jboss42.jar"/> - </fileset> - <fileset dir="${jbws42.output.lib.dir}"> - <include name="jbossws-jbws42.jar"/> - <include name="jbossws-context.war"/> - </fileset> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxws.jar"/> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${jbws42.resources.dir}"> - <include name="jbossws.beans/META-INF/jboss-beans.xml"/> - </fileset> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - <metainf dir="${jbws42.resources.dir}/jbossws.sar/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - -  - <zip zipfile="${jbws42.output.lib.dir}/jbossws-jbws42-src.zip" > - <fileset dir="${jbws42.java.dir}"/> - </zip> - - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jbws42.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.jbws42.dir}/output-tests"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="main,tests-main"> - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/etc/component-info.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/etc/component-info.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/etc/component-info.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,30 +0,0 @@ -<project name="jboss/jbossws-jboss42"> - - <component id="jboss/jbossws-jboss42" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbossws-jboss42.jar"/> - <artifact id="jbossws42.sar"/> - <artifact id="jbossws42-src.zip"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws"> - <compatible version="@jboss-jbossws@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@jboss-jbossws-spi@"/> - </import> - - <export> - </export> - - </component> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,218 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> - -  - <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.ManagedServerConfig"> -  - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="modifySOAPAddress">true</property> - -  - </bean> - -  - <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/> - -  - <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> - -  -  - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> - -  - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - -  - -  - <bean name="WSDeployerManagerJSE" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> - <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> - <inject bean="WSUnifiedDeploymentInfoDeployer"/> - <inject bean="WSUnifiedMetaDataDeployer"/> - <inject bean="WSUnifiedMetaDataAssociationDeployer"/> - <inject bean="WSModifyWebMetaDataDeployer"/> - </list> - </property> - </bean> - <bean name="WSDeployerManagerEJB" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> - <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> - <inject bean="WSUnifiedDeploymentInfoDeployer"/> - <inject bean="WSUnifiedMetaDataDeployer"/> - <inject bean="WSUnifiedMetaDataAssociationDeployer"/> - <inject bean="WSWebAppGeneratorDeployer"/> - <inject bean="WSWebAppDeployerDeployer"/> - </list> - </property> - </bean> - <bean name="WSMainDeployerManager" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> - <property name="deployers"> - <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> - <inject bean="WSEndpointNameDeployer"/> - <inject bean="WSEndpointHandlerDeployer"/> - <inject bean="WSPublishContractDeployer"/> - <inject bean="WSClassLoaderInjectionDeployer"/> - <inject bean="WSServiceEndpointInvokerDeployer"/> - <inject bean="WSEagerInitializeDeployer"/> - <inject bean="WSEventingDeployer"/> - <inject bean="WSEndpointRegistryDeployer"/> - <inject bean="WSEndpointLifecycleDeployer"/> - </list> - </property> - </bean> - -  - <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss42.ClassLoaderInjectionDeployer"/> - <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> - <property name="invocationHandler"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.ws.integration.jboss42.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss42.InvocationHandlerEJB3</value></entry> - </map> - </property> - </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/> - <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> - <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss42.ModifyWebMetaDataDeployer"> - <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> - </bean> - <bean name="WSPublishContractDeployer" class="org.jboss.ws.core.deployment.PublishContractDeployer"/> - <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.ws.core.deployment.ServiceEndpointInvokerDeployer"/> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss42.UnifiedDeploymentInfoDeployer"> - <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> - </bean> - <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataAssociationDeployer"/> - <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataDeployer"/> - <bean name="WSWebAppGeneratorDeployer" class="org.jboss.ws.core.deployment.WebAppGeneratorDeployer"/> - <bean name="WSWebAppDeployerDeployer" class="org.jboss.ws.integration.jboss42.WebAppDeployerDeployer"> - <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> - </bean> - -  - <bean name="WSServiceEndpointPublisher" class="org.jboss.ws.integration.deployment.ServiceEndpointPublisher"> - <property name="servletClass">org.jboss.ws.core.server.ServiceEndpointServlet</property> - </bean> - <bean name="WSDeploymentInfoAdapter" class="org.jboss.ws.integration.jboss42.DeploymentInfoAdapter"> - <property name="appMetaDataAdapter"><inject bean="WSAppMetaDataAdapter"/></property> - <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> - </bean> - <bean name="WSAppMetaDataAdapter" class="org.jboss.ws.integration.jboss42.ApplicationMetaDataAdapter"/> - <bean name="WSWebMetaDataAdapter" class="org.jboss.ws.integration.jboss42.WebMetaDataAdapter"/> - -  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss42.JAXRPCDeployerHookJSE"> - <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> - <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> - <property name="phaseOneInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - </list> - </property> - </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss42.JAXRPCDeployerHookEJB21"> - <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> - <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> - <property name="phaseOneInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorEJB21</value> - </list> - </property> - </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss42.JAXWSDeployerHookJSE"> - <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> - <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> - <property name="phaseOneInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - </list> - </property> - </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss42.JAXWSDeployerHookEJB3"> - <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> - <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> - <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> - <property name="phaseOneInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorEJB3</value> - </list> - </property> - </bean> - <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss42.MainDeployerHook"> - <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> - <property name="phaseTwoInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - <value>jboss.ws:service=DeployerInterceptorEJB21</value> - <value>jboss.ws:service=DeployerInterceptorEJB3</value> - </list> - </property> - </bean> - -</deployment> Added: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss42.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss42.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss42.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss42" depends="jars-jbws42,undeploy-jboss42" description="Deploy jbossws"> + + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + + <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/lib" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws42.sar"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws"> + + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> + <include name="jbossws-integration.jar"/>  + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + </target> + +</project> Property changes on: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss42.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss50.xml (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy.xml) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss50.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy-jboss50.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss50" depends="jars-jbws50,undeploy-jboss50" description="Deploy jbossws to jboss50"> + + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="${core.dir}/thirdparty"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws.output.lib.dir}/jbossws-jbws50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> + + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy" inheritall="false"/> + + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> + </target> + +</project> Added: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss42.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss42.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss42.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  + <target name="release" depends="jars" + description="Release to jboss.local.repository"> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> + <fileset dir="${jbws.output.lib.dir}"> + <include name="jbossws-jboss42.jar"/> + <include name="jbossws42.sar"/> + <include name="jbossws42-src.zip"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${int.jbws42.dir}/version.properties"/> + </filterset> + </copy> + + </target> + +</project> Property changes on: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss42.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss50.xml (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release.xml) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss50.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release-jboss50.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  + <target name="release" depends="jbws50-jars" + description="Release to jboss.local.repository"> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> + <fileset dir="${jbws50.output.lib.dir}"> + <include name="jbossws-jboss50.jar"/> + <include name="jbossws50.sar"/> + <include name="jbossws50-deployer.zip"/> + <include name="jbossws50-src.zip"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${basedir}/version.properties"/> + </filterset> + </copy> + + </target> + +</project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-release.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  - <target name="release" depends="jbws50-jars" - description="Release to jboss.local.repository"> - -  - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> - <fileset dir="${jbws50.output.lib.dir}"> - <include name="jbossws-jboss50.jar"/> - <include name="jbossws50.sar"/> - <include name="jbossws50-deployer.zip"/> - <include name="jbossws50-src.zip"/> - </fileset> - </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${basedir}/version.properties"/> - </filterset> - </copy> - - </target> - -</project> Modified: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -10,15 +10,30 @@ <project> - <property name="tests.dir" value="${int.jbws50.dir}/src/test"/> - <property name="tests.output.dir" value="${int.jbws50.dir}/output-tests"/> + <property name="tests.dir" value="${int.jbws.dir}/src/test"/> + <property name="tests.output.dir" value="${int.jbws.dir}/output-tests"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.jbws50.dir}/src/test/resources/excludes.txt"/> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> + +  + <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> + <target name="tests-prepare-jboss50"> + <property name="jboss.home" value="${jboss50.home}"/> + <property name="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss50.txt"/> + </target>  + <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> + <target name="tests-prepare-jboss42"> + <property name="jboss.home" value="${jboss42.home}"/> + <property name="excludesfile" value="${int.jbws.dir}/src/test/resources/excludes-jboss42.txt"/> + </target> + +  <target name="tests-init" depends="tests-prepare"> @@ -78,7 +93,7 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.jbws50.dir}/src/test"/> + <copy-test-resources srcdir="${int.jbws.dir}/src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> Modified: branches/tdiesler/trunk/integration/jbws-jboss50/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/build.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss50/build.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -11,36 +11,39 @@  -<project default="main" basedir="../.." name="Integration-JBoss50"> +<project default="main" basedir="../.." name="Integration-JBossWS"> <import file="${basedir}/build/ant-import/build-setup.xml"/> - <import file="${int.jbws50.dir}/ant-import/build-deploy.xml"/> - <import file="${int.jbws50.dir}/ant-import/build-testsuite.xml"/> - <import file="${int.jbws50.dir}/ant-import/build-thirdparty.xml"/> + <import file="${int.jbws.dir}/ant-import/build-deploy-jboss50.xml"/> + <import file="${int.jbws.dir}/ant-import/build-deploy-jboss42.xml"/> + <import file="${int.jbws.dir}/ant-import/build-testsuite.xml"/> + <import file="${int.jbws.dir}/ant-import/build-thirdparty.xml"/>    - <property name="jbws50.dir" value="${int.jbws50.dir}"/> - <property name="jbws50.src.dir" value="${jbws50.dir}/src/main"/> - <property name="jbws50.etc.dir" value="${jbws50.src.dir}/etc"/> - <property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/> - <property name="jbws50.resources.dir" value="${jbws50.src.dir}/resources"/> - <property name="jbws50.output.dir" value="${jbws50.dir}/output"/> - <property name="jbws50.output.classes.dir" value="${jbws50.output.dir}/classes"/> - <property name="jbws50.output.etc.dir" value="${jbws50.output.dir}/etc"/> - <property name="jbws50.output.lib.dir" value="${jbws50.output.dir}/lib"/> + <property name="jbws.dir" value="${int.jbws.dir}"/> + <property name="jbws.src.dir" value="${jbws.dir}/src/main"/> + <property name="jbws.etc.dir" value="${jbws.src.dir}/etc"/> + <property name="jbws.java.dir" value="${jbws.src.dir}/java"/> + <property name="jbws.resources.dir" value="${jbws.src.dir}/resources"/> + <property name="jbws.output.dir" value="${jbws.dir}/output"/> + <property name="jbws.output.classes.dir" value="${jbws.output.dir}/classes"/> + <property name="jbws.output.etc.dir" value="${jbws.output.dir}/etc"/> + <property name="jbws.output.lib.dir" value="${jbws.output.dir}/lib"/>    <target name="init" depends="prepare,thirdparty"> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> +  </target>  @@ -59,19 +62,13 @@  <target name="compile-classes" depends="init"> - <mkdir dir="${jbws50.output.classes.dir}"/> - <javac srcdir="${jbws50.java.dir}" sourcepath="" destdir="${jbws50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/jboss50/**"/> - <classpath refid="jbws50.integration.classpath"/> - </javac> </target>  <target name="compile-etc" depends="init"> - <mkdir dir="${jbws50.output.etc.dir}"/> - <copy todir="${jbws50.output.etc.dir}" filtering="yes"> - <fileset dir="${jbws50.etc.dir}"> + <mkdir dir="${jbws.output.etc.dir}"/> + <copy todir="${jbws.output.etc.dir}" filtering="yes"> + <fileset dir="${jbws.etc.dir}"> <include name="component-info.xml"/> </fileset> <fileset dir="${build.dir}/etc"> @@ -94,37 +91,31 @@  - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jbws50,jars-jbws42" description="Builds all jar files."> </target>  - <target name="module-jars" depends="init"> + <target name="jars-jbws50" depends="compile"> -  - <mkdir dir="${jbws50.output.lib.dir}"/> - <jar jarfile="${jbws50.output.lib.dir}/jbossws-jbws50.jar" manifest="${jbws50.output.etc.dir}/default.mf"> - <fileset dir="${jbws50.output.classes.dir}"> - <include name="org/jboss/ws/integration/jboss50/**"/> - </fileset> - </jar> + <mkdir dir="${jbws.output.lib.dir}"/>  - <war warfile="${jbws50.output.lib.dir}/jbossws-jbws50-context.war" webxml="${jbws50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${jbws50.resources.dir}/jbossws-context.war"> + <war warfile="${jbws.output.lib.dir}/jbossws-context.war" webxml="${jbws.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${jbws.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jbws50.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${jbws.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> -  - <jar jarfile="${jbws50.output.lib.dir}/jbossws-jbws50.sar" manifest="${jbws50.output.etc.dir}/default.mf"> +  + <jar jarfile="${jbws.output.lib.dir}/jbossws-jbws50.sar" manifest="${jbws.output.etc.dir}/default.mf">  @@ -139,41 +130,77 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jbws.resources.dir}/jbossws-jbws50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> -  - <zip zipfile="${jbws50.output.lib.dir}/jbossws-jbws50-deployer.zip"> +  + <zip zipfile="${jbws.output.lib.dir}/jbossws-jbws50-deployer.zip"> <fileset dir="${int.jboss50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> </fileset> - <fileset dir="${jbws50.output.lib.dir}"> - <include name="jbossws-jbws50.jar"/> - </fileset> - <fileset dir="${jbws50.resources.dir}/jbossws.deployer"> + <fileset dir="${jbws.resources.dir}/jbossws.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> -  - <zip zipfile="${jbws50.output.lib.dir}/jbossws-jbws50-src.zip" > - <fileset dir="${jbws50.java.dir}"/> - </zip> - </target> +  + <target name="jars-jbws42" depends="compile"> + + <mkdir dir="${jbws.output.lib.dir}"/> + +  + <jar jarfile="${jbws.output.lib.dir}/jbossws-jbws42.sar" manifest="${jbws.output.etc.dir}/default.mf"> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${jbws.output.lib.dir}"> + <include name="jbossws-context.war"/> + </fileset> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxws.jar"/> + <include name="jbossws-core.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="wsdl4j.jar"/> + <include name="xmlsec.jar"/> + </fileset> + <fileset dir="${jbws.resources.dir}/jbossws-jbws42.sar"> + <include name="jbossws.beans/**"/> + </fileset> + <metainf dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </metainf> + <metainf dir="${jbws.resources.dir}/jbossws-jbws42.sar/META-INF"> + <include name="jboss-service.xml"/> + <include name="jboss-beans.xml"/> + </metainf> + </jar> + + </target> +    <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jbws50.output.dir}"/> + <delete dir="${jbws.output.dir}"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.jbws50.dir}/output-tests"/> + <delete dir="${int.jbws.dir}/output-tests"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Added: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss42.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss42.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss42.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,30 @@ +<project name="jboss/jbossws-jboss42"> + + <component id="jboss/jbossws-jboss42" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-jboss42.jar"/> + <artifact id="jbossws42.sar"/> + <artifact id="jbossws42-src.zip"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@jboss-jbossws@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@jboss-jbossws-spi@"/> + </import> + + <export> + </export> + + </component> + +</project> Property changes on: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss42.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss50.xml (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info.xml) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss50.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info-jboss50.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,31 @@ +<project name="jboss/jbossws-jboss50"> + + <component id="jboss/jbossws-jboss50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-jboss50.jar"/> + <artifact id="jbossws50.sar"/> + <artifact id="jbossws50-deployer.zip"/> + <artifact id="jbossws50-src.zip"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@jboss-jbossws@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@jboss-jbossws-spi@"/> + </import> + + <export> + </export> + + </component> + +</project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/etc/component-info.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,31 +0,0 @@ -<project name="jboss/jbossws-jboss50"> - - <component id="jboss/jbossws-jboss50" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbossws-jboss50.jar"/> - <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.zip"/> - <artifact id="jbossws50-src.zip"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws"> - <compatible version="@jboss-jbossws@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@jboss-jbossws-spi@"/> - </import> - - <export> - </export> - - </component> - -</project> Added: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<server> + +  + <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.web:service=WebServer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB3"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> + </depends-list> + </mbean> + +</server> Property changes on: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,218 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + +  + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.ManagedServerConfig"> +  + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + +  + </bean> + +  + <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/> + +  + <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> + +  +  + <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> + +  + <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + +  + <bean name="WSDeployerManagerJSE" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSUnifiedMetaDataDeployer"/> + <inject bean="WSUnifiedMetaDataAssociationDeployer"/> + <inject bean="WSModifyWebMetaDataDeployer"/> + </list> + </property> + </bean> + <bean name="WSDeployerManagerEJB" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSUnifiedMetaDataDeployer"/> + <inject bean="WSUnifiedMetaDataAssociationDeployer"/> + <inject bean="WSWebAppGeneratorDeployer"/> + <inject bean="WSWebAppDeployerDeployer"/> + </list> + </property> + </bean> + <bean name="WSMainDeployerManager" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> + <inject bean="WSEndpointNameDeployer"/> + <inject bean="WSEndpointHandlerDeployer"/> + <inject bean="WSPublishContractDeployer"/> + <inject bean="WSClassLoaderInjectionDeployer"/> + <inject bean="WSServiceEndpointInvokerDeployer"/> + <inject bean="WSEagerInitializeDeployer"/> + <inject bean="WSEventingDeployer"/> + <inject bean="WSEndpointRegistryDeployer"/> + <inject bean="WSEndpointLifecycleDeployer"/> + </list> + </property> + </bean> + +  + <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss42.ClassLoaderInjectionDeployer"/> + <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> + <property name="invocationHandler"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXRPC_EJB21</key><value>org.jboss.ws.integration.jboss42.InvocationHandlerEJB21</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss42.InvocationHandlerEJB3</value></entry> + </map> + </property> + </bean> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> + <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss42.ModifyWebMetaDataDeployer"> + <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> + </bean> + <bean name="WSPublishContractDeployer" class="org.jboss.ws.core.deployment.PublishContractDeployer"/> + <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.ws.core.deployment.ServiceEndpointInvokerDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss42.UnifiedDeploymentInfoDeployer"> + <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> + </bean> + <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataAssociationDeployer"/> + <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.ws.core.deployment.WebAppGeneratorDeployer"/> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.ws.integration.jboss42.WebAppDeployerDeployer"> + <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> + </bean> + +  + <bean name="WSServiceEndpointPublisher" class="org.jboss.ws.integration.deployment.ServiceEndpointPublisher"> + <property name="servletClass">org.jboss.ws.core.server.ServiceEndpointServlet</property> + </bean> + <bean name="WSDeploymentInfoAdapter" class="org.jboss.ws.integration.jboss42.DeploymentInfoAdapter"> + <property name="appMetaDataAdapter"><inject bean="WSAppMetaDataAdapter"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> + <bean name="WSAppMetaDataAdapter" class="org.jboss.ws.integration.jboss42.ApplicationMetaDataAdapter"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.ws.integration.jboss42.WebMetaDataAdapter"/> + +  + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss42.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss42.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss42.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss42.MainDeployerHook"> + <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + +</deployment> Property changes on: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws42.sar/jbossws.beans/META-INF/jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws50.sar (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar) Copied: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jbws50.sar/META-INF (from rev 3124, branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF) Added: branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss42.txt =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss42.txt (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss42.txt 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,2 @@ + +# Nothing to exclude Property changes on: branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss42.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss50.txt (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes.txt) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss50.txt (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes-jboss50.txt 2007-05-17 21:45:05 UTC (rev 3125) @@ -0,0 +1,2 @@ + +# Nothing to exclude Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes.txt =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes.txt 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/test/resources/excludes.txt 2007-05-17 21:45:05 UTC (rev 3125) @@ -1,2 +0,0 @@ - -# Nothing to exclude Modified: branches/tdiesler/trunk/integration/sunri-jboss50/build.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri-jboss50/build.xml 2007-05-17 17:11:57 UTC (rev 3124) +++ branches/tdiesler/trunk/integration/sunri-jboss50/build.xml 2007-05-17 21:45:05 UTC (rev 3125) @@ -15,16 +15,16 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> - <import file="${int.sunri50.dir}/ant-import/build-deploy.xml"/> - <import file="${int.sunri50.dir}/ant-import/build-release.xml"/> - <import file="${int.sunri50.dir}/ant-import/build-testsuite.xml"/> - <import file="${int.sunri50.dir}/ant-import/build-thirdparty.xml"/> + <import file="${int.sunri.dir}/ant-import/build-deploy.xml"/> + <import file="${int.sunri.dir}/ant-import/build-release.xml"/> + <import file="${int.sunri.dir}/ant-import/build-testsuite.xml"/> + <import file="${int.sunri.dir}/ant-import/build-thirdparty.xml"/>    - <property name="sunri50.dir" value="${int.sunri50.dir}"/> + <property name="sunri50.dir" value="${int.sunri.dir}"/> <property name="sunri50.src.dir" value="${sunri50.dir}/src/main"/> <property name="sunri50.etc.dir" value="${sunri50.src.dir}/etc"/> <property name="sunri50.java.dir" value="${sunri50.src.dir}/java"/> @@ -83,7 +83,7 @@ <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-sunri-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> - <filtersfile file="${int.sunri50.dir}/version.properties"/> + <filtersfile file="${int.sunri.dir}/version.properties"/> </filterset> </copy> </target> @@ -179,8 +179,8 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.sunri50.dir}/output-tests"/> - <delete dir="${int.sunri50.dir}/thirdparty"/> + <delete dir="${int.sunri.dir}/output-tests"/> + <delete dir="${int.sunri.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3124 - in branches/jbossws-1.2.0.GA_JBWS-1610: jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-17 13:11:57 -0400 (Thu, 17 May 2007) New Revision: 3124 Added: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml Removed: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java Log: JBWS-1610 - Text Node and Comment Preservation For Messages Sent Across The Wire. Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -63,6 +63,7 @@ import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.core.soap.SOAPHeaderElementImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; +import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; @@ -204,10 +205,10 @@ SOAPContentElement contentElement = new SOAPHeaderElementImpl(soapName); contentElement.setParamMetaData(unboundHeader.toParameterMetaData(opMetaData)); - + if (soapHeader == null) soapHeader = soapEnvelope.addHeader(); - + soapHeader.addChildElement(contentElement); contentElement.setObjectValue(value); } @@ -265,7 +266,18 @@ SOAPElement soapBodyElement = soapBody; if (style == Style.RPC) { - soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + soapBodyElement = null; + + Iterator it = soapBody.getChildElements(); + while (soapBodyElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapBodyElement = (SOAPElement)current; + } + } + Name elName = soapBodyElement.getElementName(); QName elQName = new QName(elName.getURI(), elName.getLocalName(), elName.getPrefix()); @@ -459,8 +471,14 @@ Iterator bodyChildren = soapBody.getChildElements(); SOAPBodyElement soapBodyElement = null; - if (bodyChildren.hasNext() != false) - soapBodyElement = (SOAPBodyElement)bodyChildren.next(); + while (bodyChildren.hasNext() && soapBodyElement == null) + { + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } // Translate the SOAPFault to an exception and throw it if (soapBodyElement instanceof SOAPFaultImpl) @@ -703,8 +721,14 @@ Iterator childElements = soapElement.getChildElements(); while (childElements.hasNext()) { - SOAPElementImpl childElement = (SOAPElementImpl)childElements.next(); + Object child = childElements.next(); + if (child instanceof TextImpl) + { + continue; + } + SOAPElementImpl childElement = (SOAPElementImpl)child; + // If this message was manipulated by a handler the child may not be a content element if (!(childElement instanceof SOAPContentElement)) childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -23,10 +23,12 @@ // $Id$ +import java.util.Iterator; import java.util.List; import java.util.Map; import javax.xml.namespace.QName; +import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPMessage; import javax.xml.transform.Source; import javax.xml.ws.handler.Handler; @@ -44,6 +46,7 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.SOAPBodyImpl; +import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -87,8 +90,24 @@ QName xmlName = paramMetaData.getXmlName(); SOAPMessage reqMessage = (SOAPMessage)payload; - SOAPBodyImpl soapBody = (SOAPBodyImpl)reqMessage.getSOAPBody(); - Source source = soapBody.getPayload(); + SOAPBodyImpl body = (SOAPBodyImpl)reqMessage.getSOAPBody(); + + SOAPContentElement bodyElement = null; + Iterator bodyChildren = body.getChildElements(); + while (bodyChildren.hasNext() && bodyElement == null) + { + Object next = bodyChildren.next(); + if (next instanceof SOAPContentElement) + { + bodyElement = (SOAPContentElement)next; + } + } + + Source source = bodyElement.getXMLFragment().getSource(); + + if (source == null) + throw new IllegalStateException("Payload cannot be null"); + epInv.setRequestParamValue(xmlName, source); return epInv; Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -26,6 +26,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.UndeclaredThrowableException; +import java.util.Iterator; import javax.management.MBeanException; import javax.xml.namespace.QName; @@ -160,7 +161,8 @@ // Check if protocol handlers modified the payload if (msgContext.isModified() == true) { - if(log.isDebugEnabled()) log.debug("Handler modified body payload, unbind message again"); + if (log.isDebugEnabled()) + log.debug("Handler modified body payload, unbind message again"); epInv = binding.unbindRequestMessage(opMetaData, reqMessage); } @@ -183,8 +185,8 @@ if (epMetaData.getType() == EndpointMetaData.Type.JAXWS) msgContext.setProperty(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE); - if(binding instanceof CommonSOAPBinding) - XOPContext.setMTOMEnabled( ((CommonSOAPBinding)binding).isMTOMEnabled()); + if (binding instanceof CommonSOAPBinding) + XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); // Bind the response message SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv); @@ -228,7 +230,8 @@ protected CommonMessageContext processPivot(CommonMessageContext requestContext) { - if(log.isDebugEnabled()) log.debug("Begin response processing"); + if (log.isDebugEnabled()) + log.debug("Begin response processing"); // TODO: implement return requestContext; } @@ -243,9 +246,21 @@ { String faultString; SOAPBody soapBody = reqMessage.getSOAPBody(); - if (soapBody.getChildElements().hasNext()) + + Iterator bodyChildren = soapBody.getChildElements(); + SOAPBodyElement soapBodyElement = null; + + while (bodyChildren.hasNext() && soapBodyElement == null) { - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } + + if (soapBodyElement != null) + { Name soapName = soapBodyElement.getElementName(); faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName; } @@ -258,8 +273,10 @@ // with a faultcode of "Client", unless a "MustUnderstand" or "VersionMismatch" fault is generated. if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext()) { + QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND; throw new SOAPFaultException(faultCode, faultString, null, null); + } else { Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -149,7 +149,7 @@ //TODO: SAAJ 1.3 throw new NotImplementedException(); } - + /** * Adds an attribute with the specified name and value to this SOAPElement object. * @@ -460,9 +460,7 @@ } else if (node instanceof Text) { - String value = node.getNodeValue(); - if (value.trim().length() > 0) - list.add(node); + list.add(node); } } return list.iterator(); @@ -826,7 +824,14 @@ } else if (node instanceof TextImpl) { + boolean comment = node.getNodeType() == Node.COMMENT_NODE; + if (comment) + out.write(""); } else { Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -89,8 +89,12 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + list.add(shElement); + } } return list.iterator(); } @@ -107,9 +111,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor())) - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor())) + list.add(shElement); + } } return list.iterator(); } @@ -127,9 +135,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor()) && shElement.getMustUnderstand()) - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor()) && shElement.getMustUnderstand()) + list.add(shElement); + } } return list.iterator(); } @@ -141,9 +153,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - removeChild(shElement); - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + removeChild(shElement); + list.add(shElement); + } } return list.iterator(); } @@ -158,11 +174,15 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor())) + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) { - removeChild(shElement); - list.add(shElement); + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor())) + { + removeChild(shElement); + list.add(shElement); + } } } return list.iterator(); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -68,7 +68,8 @@ if (wsaAction.equals(opAux.getSOAPAction())) { opMetaData = opAux; - if(log.isDebugEnabled()) log.debug("Use wsa:Action dispatch: " + wsaAction); + if (log.isDebugEnabled()) + log.debug("Use wsa:Action dispatch: " + wsaAction); break; } } @@ -87,8 +88,19 @@ SOAPBody soapBody = soapMessage.getSOAPBody(); Iterator bodyChildren = soapBody.getChildElements(); - if (bodyChildren.hasNext() == false) + SOAPBodyElement soapBodyElement = null; + + while (bodyChildren.hasNext() && soapBodyElement == null) { + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } + + if (soapBodyElement == null) + { if (epMetaData.getStyle() == Style.RPC) throw new SOAPException("Empty SOAP body with no child element not supported for RPC"); @@ -97,7 +109,8 @@ { if (opAux.getParameters().size() == 0) { - if(log.isDebugEnabled()) log.debug ("Dispatching empty SOAP body"); + if (log.isDebugEnabled()) + log.debug("Dispatching empty SOAP body"); opMetaData = opAux; break; } @@ -105,9 +118,14 @@ } else { - SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next(); - if (bodyChildren.hasNext()) + while (bodyChildren.hasNext()) + { + // Skip the TextImpl instances as they do not need to be counted. + if (bodyChildren.next() instanceof TextImpl) + continue; + throw new SOAPException("SOAPBody has more than on child element"); + } Name soapName = soapBodyElement.getElementName(); QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName()); @@ -122,14 +140,16 @@ { if (opAux.isMessageEndpoint()) { - if(log.isDebugEnabled()) log.debug("Use generic message style dispatch"); + if (log.isDebugEnabled()) + log.debug("Use generic message style dispatch"); opMetaData = opAux; break; } } } - if(log.isDebugEnabled()) log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); + if (log.isDebugEnabled()) + log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); return opMetaData; } } \ No newline at end of file Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -2415,10 +2415,45 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-rpclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-doclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/*RequestStruct.class"/> Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -28,6 +28,7 @@ import java.io.IOException; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPEnvelope; @@ -39,6 +40,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.core.utils.DOMWriter; import org.w3c.dom.Element; @@ -81,7 +83,9 @@ assertEquals("env:Envelope", env.getNodeName()); assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI()); - SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements().next(); + Name name = new NameImpl("businessList", null, "urn:uddi-org:api_v2"); + SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements(name).next(); + assertEquals("urn:uddi-org:api_v2", soapBodyElement.getNamespaceURI()); } @@ -222,4 +226,38 @@ String wasXML = DOMWriter.printNode(wasEnv, false); assertEquals(expXML, wasXML); } -} \ No newline at end of file + + public void testWriteToPreserveFormatting() throws Exception + { + String expMessage = + "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + " <soapenv:Header></soapenv:Header>" + + " <soapenv:Body>" + + " " + + " <typ:lookup xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + " " + + " <firstName>Joe</firstName>" + + " <surname>Bloggs</surname>" + + " " + + " </typ:lookup>" + + " " + + " </soapenv:Body>" + + "</soapenv:Envelope>"; + + MessageFactoryImpl factory = new MessageFactoryImpl(); + ByteArrayInputStream inputStream = new ByteArrayInputStream(expMessage.getBytes()); + SOAPMessage soapMsg = factory.createMessage(null, inputStream); + + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + soapMsg.writeTo(outputStream); + + String actualMessage = new String(outputStream.toByteArray(), "UTF-8"); + + //System.out.println("A - " + expMessage); + //System.out.println("B - " + DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), false)); + //System.out.println("C - " + actualMessage); + + assertEquals(expMessage, actualMessage); + } + +} Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -33,6 +33,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.core.soap.NameImpl; /** * Test the SOAPElement @@ -114,8 +115,10 @@ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(xml.getBytes())); SOAPFactory soapFactory = SOAPFactory.newInstance(); - SOAPElement bearElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + Name name = new NameImpl("bear", "np", "http://northpole.net"); + SOAPElement bearElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements(name).next(); + assertEquals(2, getIteratorCount(bearElement.getAllAttributes())); Iterator it = bearElement.getAllAttributes(); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -38,6 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.utils.DOMUtils; /** @@ -66,7 +67,10 @@ MessageFactory factory = MessageFactory.newInstance(); SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPFault soapFault = (SOAPFault)soapBody.getChildElements().next(); + + Name name = new NameImpl("Fault", "env", "http://schemas.xmlsoap.org/soap/envelope/"); + SOAPFault soapFault = (SOAPFault)soapBody.getChildElements(name).next(); + assertEquals("env:Client", soapFault.getFaultCode()); assertEquals("Some fault message", soapFault.getFaultString()); assertEquals("Some fault actor", soapFault.getFaultActor()); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -61,9 +61,10 @@ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); SOAPHeader soapHeader = soapEnv.getHeader(); - SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements().next(); - + Name name = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements(name).next(); + assertEquals(name, shElement.getElementName()); assertEquals("BradPitt", shElement.getActor()); @@ -86,9 +87,10 @@ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); SOAPHeader soapHeader = soapEnv.getHeader(); - SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements().next(); - + Name name = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements(name).next(); + assertEquals(name, shElement.getElementName()); assertTrue(shElement.getMustUnderstand()); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -206,7 +206,7 @@ assertEquals("SomeHeaderValue", foo.getValue()); assertEquals("SomeOtherValue", bar.getValue()); - assertFalse(soapHeader.getChildElements().hasNext()); + assertFalse(soapHeader.examineAllHeaderElements().hasNext()); } public void testExtractHeaderElements() throws Exception @@ -234,7 +234,7 @@ assertEquals("SomeOtherValue", bar.getValue()); - Iterator childElements = soapHeader.getChildElements(); + Iterator childElements = soapHeader.examineAllHeaderElements(); SOAPHeaderElement foo = (SOAPHeaderElement)childElements.next(); Name fooName = new NameImpl("Foo", "ns1", "http://org.jboss.ws/header"); Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -28,6 +28,7 @@ import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPElement; @@ -38,6 +39,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.core.soap.NameImpl; /** * The prefix "xsi" for attribute "xsi:nil" is not bound @@ -119,8 +121,12 @@ SOAPMessage reqMessage = factory.createMessage(null, new ByteArrayInputStream(reqStr.getBytes())); SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection(); SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1186"); + + Name name = new NameImpl("echo", "ns1", "http://org.jboss.test.ws/jbws1186"); SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); + + name = new NameImpl("result"); + soapElement = (SOAPElement)soapElement.getChildElements(name).next(); assertEquals("1", soapElement.getAttribute("xsi:nil")); } } Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647 (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647) Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import java.io.ByteArrayOutputStream; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public abstract class AbstractHandler extends GenericHandler -{ - - private static final Logger log = Logger.getLogger(AbstractHandler.class); - - public abstract String getExpectedMessage(); - - public boolean handleRequest(MessageContext msgContext) - { - log.info("handleRequest"); - - boolean valid = false; - - SOAPMessageContext messageContext = (SOAPMessageContext)msgContext; - - SOAPMessage soapMessage = messageContext.getMessage(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - String receivedMessage = ""; - try - { - soapMessage.writeTo(baos); - receivedMessage = baos.toString(); - } - catch (Exception e) - { - throw new RuntimeException("Unable to process SOAPMessage", e); - } - - valid = getExpectedMessage().equals(receivedMessage); - if (valid == false) - { - log.error("Received message does not equal expected message."); - log.info("EXP - " + getExpectedMessage()); - log.info("ACT - " + receivedMessage); - - throw new RuntimeException("Received message does not equal expected message."); - } - - return valid; - } - - public QName[] getHeaders() - { - return null; - } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import java.io.ByteArrayOutputStream; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public abstract class AbstractHandler extends GenericHandler +{ + + private static final Logger log = Logger.getLogger(AbstractHandler.class); + + public abstract String getExpectedMessage(); + + public boolean handleRequest(MessageContext msgContext) + { + log.info("handleRequest"); + + boolean valid = false; + + SOAPMessageContext messageContext = (SOAPMessageContext)msgContext; + + SOAPMessage soapMessage = messageContext.getMessage(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + String receivedMessage = ""; + try + { + soapMessage.writeTo(baos); + receivedMessage = baos.toString(); + } + catch (Exception e) + { + throw new RuntimeException("Unable to process SOAPMessage", e); + } + + valid = getExpectedMessage().equals(receivedMessage); + if (valid == false) + { + log.error("Received message does not equal expected message."); + log.info("EXP - " + getExpectedMessage()); + log.info("ACT - " + receivedMessage); + + throw new RuntimeException("Received message does not equal expected message."); + } + + return valid; + } + + public QName[] getHeaders() + { + return null; + } + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class DocumentHandler extends AbstractHandler -{ - - public static final String MESSAGE = - "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + - " " + - " <soapenv:Header></soapenv:Header>" + - " " + - " <soapenv:Body>" + - " " + - " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + - " " + - " <String_1>My Message</String_1>" + - " " + - " </typ:echoMessage>" + - " " + - " </soapenv:Body>" + - " " + - "</soapenv:Envelope>"; - - public String getExpectedMessage() - { - return MESSAGE; - } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class DocumentHandler extends AbstractHandler +{ + + public static final String MESSAGE = + "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + + " " + + " <soapenv:Header></soapenv:Header>" + + " " + + " <soapenv:Body>" + + " " + + " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + + " " + + " <String_1>My Message</String_1>" + + " " + + " </typ:echoMessage>" + + " " + + " </soapenv:Body>" + + " " + + "</soapenv:Envelope>"; + + public String getExpectedMessage() + { + return MESSAGE; + } + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class JBWS1647DocumentTestCase extends TestCaseBase -{ - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war"); - } - - public String getMessage() - { - return DocumentHandler.MESSAGE; - } - - public String getToUrl() - { - return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint"; - } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class JBWS1647DocumentTestCase extends TestCaseBase +{ + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war"); + } + + public String getMessage() + { + return DocumentHandler.MESSAGE; + } + + public String getToUrl() + { + return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint"; + } + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public class JBWS1647RPCTestCase extends TestCaseBase -{ - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war"); - } - - public String getMessage() - { - return RpcHandler.MESSAGE; - } - - public String getToUrl() - { - return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint"; - } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public class JBWS1647RPCTestCase extends TestCaseBase +{ + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war"); + } + + public String getMessage() + { + return RpcHandler.MESSAGE; + } + + public String getToUrl() + { + return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint"; + } + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class RpcHandler extends AbstractHandler -{ - - public static final String MESSAGE = - "<soapenv:Envelope xmlns:jbw='http://org.jboss.test.ws/jbws1647' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + - " " + - " <soapenv:Header></soapenv:Header>" + - " " + - " <soapenv:Body>" + - " " + - " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" + - " " + - " <String_1>My Message</String_1>" + - " " + - " </jbw:echoMessage>" + - " " + - " </soapenv:Body>" + - " " + - "</soapenv:Envelope>"; - - public String getExpectedMessage() - { - return MESSAGE; - } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class RpcHandler extends AbstractHandler +{ + + public static final String MESSAGE = + "<soapenv:Envelope xmlns:jbw='http://org.jboss.test.ws/jbws1647' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + + " " + + " <soapenv:Header></soapenv:Header>" + + " " + + " <soapenv:Body>" + + " " + + " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" + + " " + + " <String_1>My Message</String_1>" + + " " + + " </jbw:echoMessage>" + + " " + + " </soapenv:Body>" + + " " + + "</soapenv:Envelope>"; + + public String getExpectedMessage() + { + return MESSAGE; + } + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import java.io.ByteArrayInputStream; - -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import org.jboss.test.ws.JBossWSTest; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public abstract class TestCaseBase extends JBossWSTest -{ - - public abstract String getMessage(); - - public abstract String getToUrl(); - - public void testCall() throws Exception - { - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes())); - - SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); - SOAPConnection con = conFactory.createConnection(); - SOAPMessage resMessage = con.call(soapMessage, getToUrl()); - - SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); - assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName()); - } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import java.io.ByteArrayInputStream; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.test.ws.JBossWSTest; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public abstract class TestCaseBase extends JBossWSTest +{ + + public abstract String getMessage(); + + public abstract String getToUrl(); + + public void testCall() throws Exception + { + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes())); + + SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); + SOAPConnection con = conFactory.createConnection(); + SOAPMessage resMessage = con.call(soapMessage, getToUrl()); + + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName()); + } + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public interface TestEndpoint extends Remote -{ - - public String echoMessage(final String message) throws RemoteException; - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public interface TestEndpoint extends Remote +{ + + public String echoMessage(final String message) throws RemoteException; + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import org.jboss.logging.Logger; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - private static final Logger log = Logger.getLogger(TestEndpointImpl.class); - - public String echoMessage(final String message) - { - return message; - } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import org.jboss.logging.Logger; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public class TestEndpointImpl implements TestEndpoint +{ + + private static final Logger log = Logger.getLogger(TestEndpointImpl.class); + + public String echoMessage(final String message) + { + return message; + } + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 15 11:14:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jaxrpc.jbws1647; - - -public class TestEndpoint_echoMessage_RequestStruct -{ - -protected java.lang.String string_1; -public TestEndpoint_echoMessage_RequestStruct(){} - -public TestEndpoint_echoMessage_RequestStruct(java.lang.String string_1){ -this.string_1=string_1; -} -public java.lang.String getString_1() { return string_1 ;} - -public void setString_1(java.lang.String string_1){ this.string_1=string_1; } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 15 11:14:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jaxrpc.jbws1647; + + +public class TestEndpoint_echoMessage_RequestStruct +{ + +protected java.lang.String string_1; +public TestEndpoint_echoMessage_RequestStruct(){} + +public TestEndpoint_echoMessage_RequestStruct(java.lang.String string_1){ +this.string_1=string_1; +} +public java.lang.String getString_1() { return string_1 ;} + +public void setString_1(java.lang.String string_1){ this.string_1=string_1; } + +} Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 15 11:14:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jaxrpc.jbws1647; - - -public class TestEndpoint_echoMessage_ResponseStruct -{ - -protected java.lang.String result; -public TestEndpoint_echoMessage_ResponseStruct(){} - -public TestEndpoint_echoMessage_ResponseStruct(java.lang.String result){ -this.result=result; -} -public java.lang.String getResult() { return result ;} - -public void setResult(java.lang.String result){ this.result=result; } - -} Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 15 11:14:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jaxrpc.jbws1647; + + +public class TestEndpoint_echoMessage_ResponseStruct +{ + +protected java.lang.String result; +public TestEndpoint_echoMessage_ResponseStruct(){} + +public TestEndpoint_echoMessage_ResponseStruct(java.lang.String result){ +this.result=result; +} +public java.lang.String getResult() { return result ;} + +public void setResult(java.lang.String result){ this.result=result; } + +} Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -28,6 +28,7 @@ import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.MimeHeaders; +import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; @@ -37,6 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.soap.NameImpl; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -115,7 +117,7 @@ String xmlStr = "<?xml version='1.0' encoding='UTF-8' ?>" + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:tns='http://uri.jboss.org'>" + " <env:Body>" + - " <tns:testMessage><![CDATA[ Hello ]]></tns:testMessage>" + + " <tns:myMessage><![CDATA[ Hello ]]></tns:myMessage>" + " </env:Body>" + "</env:Envelope>"; @@ -185,8 +187,10 @@ SOAPMessage soapMessage = mf.createMessage(mimeHeaders, new ByteArrayInputStream(xmlStr.getBytes())); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next(); + Name name = new NameImpl("myMessage", "tns", "http://uri.jboss.org"); + SOAPElement soapElement = (SOAPElement)soapBody.getChildElements(name).next(); + StringBuffer builder = new StringBuffer(); NodeList nlist = soapElement.getChildNodes(); for (int i = 0; i < nlist.getLength(); i++) Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-17 14:11:14 UTC (rev 3123) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-17 17:11:57 UTC (rev 3124) @@ -31,6 +31,7 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPEnvelope; @@ -45,6 +46,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.w3c.dom.Element; @@ -131,7 +133,9 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - Element child = (Element)resEnv.getBody().getChildElements().next(); + Name name = new NameImpl("user", "ns1", "http://org.jboss.ws/provider"); + Element child = (Element)resEnv.getBody().getChildElements(name).next(); + JAXBContext jc = JAXBContext.newInstance(new Class[]{UserType.class}); UserType user = (UserType)jc.createUnmarshaller().unmarshal(new DOMSource(child)); Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647 (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647) Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit) Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF) Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,56 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_RequestStruct</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessage</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>string_1</java-variable-name> - <xml-element-name>String_1</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_ResponseStruct</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessageResponse</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>result</java-variable-name> - <xml-element-name>result</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoMessage</java-method-name> - <wsdl-operation>echoMessage</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,56 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_RequestStruct</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessage</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>string_1</java-variable-name> + <xml-element-name>String_1</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_ResponseStruct</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessageResponse</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>result</java-variable-name> + <xml-element-name>result</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoMessage</java-method-name> + <wsdl-operation>echoMessage</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,21 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - - <handler> - <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class> - </handler> - - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,21 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + + <handler> + <handler-name>TestHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class> + </handler> + + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl) Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1647/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws1647/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1647/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='echoMessage'> - <sequence> - <element name='String_1' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='echoMessageResponse'> - <sequence> - <element name='result' nillable='true' type='string'/> - </sequence> - </complexType> - <element name='echoMessage' type='tns:echoMessage'/> - <element name='echoMessageResponse' type='tns:echoMessageResponse'/> - </schema> - </types> - <message name='TestEndpoint_echoMessage' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part element='ns1:echoMessage' name='echoMessage'/> - </message> - <message name='TestEndpoint_echoMessageResponse'> - <part element='ns1:echoMessageResponse' name='echoMessageResponse'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoMessage' parameterOrder='echoMessage'> - <input message='tns:TestEndpoint_echoMessage'/> - <output message='tns:TestEndpoint_echoMessageResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoMessage'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1647/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws1647/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1647/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='echoMessage'> + <sequence> + <element name='String_1' nillable='true' type='string'/> + </sequence> + </complexType> + <complexType name='echoMessageResponse'> + <sequence> + <element name='result' nillable='true' type='string'/> + </sequence> + </complexType> + <element name='echoMessage' type='tns:echoMessage'/> + <element name='echoMessageResponse' type='tns:echoMessageResponse'/> + </schema> + </types> + <message name='TestEndpoint_echoMessage' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:echoMessage' name='echoMessage'/> + </message> + <message name='TestEndpoint_echoMessageResponse'> + <part element='ns1:echoMessageResponse' name='echoMessageResponse'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoMessage' parameterOrder='echoMessage'> + <input message='tns:TestEndpoint_echoMessage'/> + <output message='tns:TestEndpoint_echoMessageResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoMessage'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="document"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="document"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit) Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF) Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoMessage</java-method-name> - <wsdl-operation>echoMessage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,37 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoMessage</java-method-name> + <wsdl-operation>echoMessage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,21 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - - <handler> - <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class> - </handler> - - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,21 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + + <handler> + <handler-name>TestHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class> + </handler> + + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl) Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoMessage'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoMessageResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoMessage' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoMessage'/> - <output message='tns:TestEndpoint_echoMessageResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoMessage'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_echoMessage'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoMessageResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoMessage' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echoMessage'/> + <output message='tns:TestEndpoint_echoMessageResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoMessage'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-05-17 10:57:34 UTC (rev 3118) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml (from rev 3118, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-05-17 17:11:57 UTC (rev 3124) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3123 - in branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws: jaxrpc/jbws1610 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-17 10:11:14 -0400 (Thu, 17 May 2007) New Revision: 3123 Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java Log: JBWS-1610 - Test case modifications. Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-05-17 12:18:13 UTC (rev 3122) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-05-17 14:11:14 UTC (rev 3123) @@ -151,8 +151,14 @@ */ public void testTextNodeAccess() throws Exception { - String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + "<env:Body>" + "<ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'>" - + "<String_1>world</String_1>" + "</ns1:hello>" + "</env:Body>" + "</env:Envelope>"; + String envStr = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + "<env:Body>" + + "<ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'>" + + "<String_1>world</String_1>" + + "</ns1:hello>" + + "</env:Body>" + + "</env:Envelope>"; MessageFactory factory = MessageFactory.newInstance(); SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); @@ -171,9 +177,7 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); soapMessage.writeTo(baos); - String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>world::SOAP header was added</String_1></ns1:hello></env:Body></env:Envelope>"; - System.out.println(expEnv); - System.out.println(baos.toString()); + String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Body><ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>world::SOAP header was added</String_1></ns1:hello></env:Body></env:Envelope>"; assertEquals(expEnv, baos.toString()); } } Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java 2007-05-17 12:18:13 UTC (rev 3122) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1610/JBWS1610TestCase.java 2007-05-17 14:11:14 UTC (rev 3123) @@ -68,9 +68,6 @@ assertNotNull(response); assertEquals("String Modifed By Handler", "YYXXFirst StringXXYY", response.getStringA()); - assertEquals("String Modifed By Handler", "YYXXSecond StringXXYY", response.getStringB()); - - System.out.println(response.getStringA() + " - " + response.getStringB()); - + assertEquals("String Modifed By Handler", "YYXXSecond StringXXYY", response.getStringB()); } }

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3122 - in branches/JBWS-856/jbossws-core/src/java/org/jboss/ws: metadata/builder/jaxws and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: palin Date: 2007-05-17 08:18:13 -0400 (Thu, 17 May 2007) New Revision: 3122 Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java Log: wsprovide now works with @Policy annotation too Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-17 11:55:45 UTC (rev 3121) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-17 12:18:13 UTC (rev 3122) @@ -96,11 +96,6 @@ InputStream is = null; try { - System.out.println("++++++++++++++++++++"+policy.policyFileLocation()); - System.out.println("++++++++++++++++++++"+toolMode); - System.out.println("++++++++++++++++++++"+Thread.currentThread().getContextClassLoader().getResource(policy.policyFileLocation())); - - DOMPolicyReader reader = (DOMPolicyReader) PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER); if (toolMode) { @@ -117,7 +112,6 @@ PolicyScopeLevel.WSDL_BINDING.equals(scope)) { deployPolicy(normPolicy, scope, epMetaData); - System.out.println("++++++++++++++++++++"+epMetaData.getExtensions()); } else { Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-17 11:55:45 UTC (rev 3121) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-17 12:18:13 UTC (rev 3122) @@ -132,23 +132,21 @@ createJAXBContext(sepMetaData); populateXmlTypes(sepMetaData); - // The server must always generate WSDL - if (generateWsdl || !toolMode) - processOrGenerateWSDL(seiClass, serviceMetaData, result.wsdlLocation, sepMetaData, result.policyLocation); - -// Process an optional @PolicyAttachment annotation + //Process an optional @PolicyAttachment annotation if (sepClass.isAnnotationPresent(PolicyAttachment.class)) { PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode); policyBuilder.processPolicyAnnotations(sepMetaData, sepClass, udi); } - + // The server must always generate WSDL + if (generateWsdl || !toolMode) + processOrGenerateWSDL(seiClass, serviceMetaData, result.wsdlLocation, sepMetaData, result.policyLocation); + // No need to process endpoint items if we are in tool mode if (toolMode) return sepMetaData; - // Sanity check: read the generated WSDL and initialize the schema model // Note, this should no longer be needed, look into removing it WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions();

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3121 - in branches/JBWS-856: jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-05-17 07:55:45 -0400 (Thu, 17 May 2007) New Revision: 3121 Removed: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java Log: wsprovide still don't work with @Policy annotation, but file reading seems correct Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-17 11:53:42 UTC (rev 3120) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-17 11:55:45 UTC (rev 3121) @@ -96,6 +96,11 @@ InputStream is = null; try { + System.out.println("++++++++++++++++++++"+policy.policyFileLocation()); + System.out.println("++++++++++++++++++++"+toolMode); + System.out.println("++++++++++++++++++++"+Thread.currentThread().getContextClassLoader().getResource(policy.policyFileLocation())); + + DOMPolicyReader reader = (DOMPolicyReader) PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER); if (toolMode) { @@ -112,6 +117,7 @@ PolicyScopeLevel.WSDL_BINDING.equals(scope)) { deployPolicy(normPolicy, scope, epMetaData); + System.out.println("++++++++++++++++++++"+epMetaData.getExtensions()); } else { @@ -205,6 +211,7 @@ normPolicy = null; } deployPolicy(normPolicy, scope, extMetaData); + } } } Modified: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java =================================================================== --- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-17 11:53:42 UTC (rev 3120) +++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-17 11:55:45 UTC (rev 3121) @@ -69,14 +69,12 @@ private Hello getPort() throws Exception { URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy/HelloService.wsdl").toURL(); - URL securityURL = new File("resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); QName serviceName = new QName("http://org.jboss.ws/samples/wssecurityAnnotatedpolicy", "HelloService"); + Service service = Service.create(wsdlURL, serviceName); - ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); Hello port = (Hello)service.getPort(Hello.class); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurityAnnotatedpolicy-encrypt"); Deleted: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-05-17 11:53:42 UTC (rev 3120) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-05-17 11:55:45 UTC (rev 3121) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <config> - <encrypt type="x509v3" alias="wsse"/> - <requires> - <encryption/> - </requires> - </config> -</jboss-ws-security> \ No newline at end of file

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3120 - in branches/tdiesler/trunk: build/ant-import and 15 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-17 07:53:42 -0400 (Thu, 17 May 2007) New Revision: 3120 Added: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHookEJB.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ArchiveDeployerHook.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ClassLoaderInjectionDeployer.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB21.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB3.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXRPCDeployerHookEJB21.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/MainDeployerHook.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityRolesHandlerEJB21.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityRolesHandlerEJB3.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInterceptor.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/UnifiedDeploymentInfoDeployer.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebAppDeployerDeployer.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/AbstractInvocationHandler.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandlerJSE.java Removed: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractInvocationHandler.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractApplicationMetaDataAdapter.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookEJB.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookJSE.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ApplicationMetaDataAdapter.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ArchiveDeployerHook.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ClassLoaderInjectionDeployer.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapter.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/MainDeployerHook.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB21.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB3.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebMetaDataAdapter.java branches/tdiesler/trunk/testsuite/build.xml Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml branches/tdiesler/trunk/build/build.xml branches/tdiesler/trunk/integration/jboss42/.classpath branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB21.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB3.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java branches/tdiesler/trunk/jbossws/build.xml branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml Log: Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -54,26 +54,14 @@ <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> -  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> -    <target name="prepare"> - - <echo message="jboss.home = ${jboss.home}"/> - <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> - </target> </project> \ No newline at end of file Modified: branches/tdiesler/trunk/build/build.xml =================================================================== --- branches/tdiesler/trunk/build/build.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/build/build.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -39,7 +39,6 @@ <target name="clean" depends="prepare" description="Cleans up most generated files."> <ant antfile="${spi.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.sunri50.dir}/build.xml" target="clean" inheritall="false"/> @@ -48,7 +47,6 @@ <target name="clobber" depends="prepare" description="Cleans up all generated files."> <ant antfile="${spi.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/> - <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.sunri50.dir}/build.xml" target="clobber" inheritall="false"/> @@ -64,7 +62,6 @@ <target name="most" description="Builds almost everything." depends="prepare"> <ant antfile="${spi.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/> - <ant antfile="${testsuite.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.sunri50.dir}/build.xml" target="most" inheritall="false"/> Modified: branches/tdiesler/trunk/integration/jboss42/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-17 11:53:42 UTC (rev 3120) @@ -4,5 +4,9 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry kind="lib" path="/spi/thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -28,19 +28,27 @@ <target name="thirdparty-get" depends="thirdparty-init" description="Gets the thirdparty libraries"/> - <target name="thirdparty-classpath" depends="thirdparty-init"> + <target name="thirdparty-classpath" depends="thirdparty-get">  <path id="jbws42.integration.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/> + <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/> + <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/> <pathelement location="${jboss42.lib}/jboss-common.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> + <pathelement location="${jboss42.lib}/jboss-xml-binding.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/> <pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/> <pathelement location="${jboss42.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss42.server.lib}/servlet-api.jar"/> <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/> + <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> </path> Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractApplicationMetaDataAdapter.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public abstract class AbstractApplicationMetaDataAdapter +{ + public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, ApplicationMetaData apmd) + { + udi.addAttachment(ApplicationMetaData.class, apmd); + + UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); + buildUnifiedBeanMetaData(umd, apmd); + umd.setConfigName(apmd.getConfigName()); + umd.setConfigFile(apmd.getConfigFile()); + umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot()); + umd.setSecurityDomain(apmd.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd)); + return umd; + } + + protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd) + { + return new PublishLocationAdapter () + { + public String getWsdlPublishLocationByName(String name) + { + return apmd.getWsdlPublishLocationByName(name); + } + }; + } + + protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData) + { + List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + Iterator it = metaData.getEnterpriseBeans(); + while (it.hasNext()) + { + BeanMetaData bmd = (BeanMetaData)it.next(); + UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd); + if (ubmd != null) + { + beans.add(ubmd); + } + } + umd.setEnterpriseBeans(beans); + } + + protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd); +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,202 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import java.util.List; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.DeployerManager; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.WSDeploymentException; +import org.jboss.ws.integration.jboss42.DeployerHook; +import org.jboss.ws.integration.jboss42.DeployerInterceptorMBean; + +/** + * An abstract web service deployer. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHook implements DeployerHook +{ + // provide logging + protected final Logger log = Logger.getLogger(getClass()); + + protected DeployerManager deployerManager; + private List<ObjectName> phaseOneInterceptors; + private List<ObjectName> phaseTwoInterceptors; + private String deploymentClass; + private String serviceClass; + private String endpointClass; + + public void setDeployerManager(DeployerManager deploymentManager) + { + this.deployerManager = deploymentManager; + } + + public void setDeploymentClass(String deploymentClass) + { + this.deploymentClass = deploymentClass; + } + + public void setEndpointClass(String endpointClass) + { + this.endpointClass = endpointClass; + } + + public void setServiceClass(String serviceClass) + { + this.serviceClass = serviceClass; + } + + public Deployment createDeployment() + { + try + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + Class<?> clazz = loader.loadClass(deploymentClass); + return (Deployment)clazz.newInstance(); + } + catch (Exception ex) + { + throw new WSDeploymentException("Cannot load: " + deploymentClass); + } + } + + public Service createService() + { + try + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + Class<?> clazz = loader.loadClass(serviceClass); + return (Service)clazz.newInstance(); + } + catch (Exception ex) + { + throw new WSDeploymentException("Cannot load: " + serviceClass); + } + } + + public Endpoint createEndpoint() + { + try + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + Class<?> clazz = loader.loadClass(endpointClass); + return (Endpoint)clazz.newInstance(); + } + catch (Exception ex) + { + throw new WSDeploymentException("Cannot load: " + endpointClass); + } + } + + public void setPhaseOneInterceptors(List<ObjectName> phaseOneInterceptors) + { + this.phaseOneInterceptors = phaseOneInterceptors; + } + + public void setPhaseTwoInterceptors(List<ObjectName> phaseTwoInterceptors) + { + this.phaseTwoInterceptors = phaseTwoInterceptors; + } + + /** Return true if this deployment should be ignored + */ + public boolean ignoreDeployment(DeploymentInfo unit) + { + return false; + } + + /** Add the hooks to the interceptors + */ + public void start() + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + try + { + if (phaseOneInterceptors != null) + { + for (ObjectName oname : phaseOneInterceptors) + { + DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); + interceptor.addPhaseOneHook(this); + } + } + + if (phaseTwoInterceptors != null) + { + for (ObjectName oname : phaseTwoInterceptors) + { + DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); + interceptor.addPhaseTwoHook(this); + } + } + } + catch (MBeanProxyCreationException e) + { + throw new WSDeploymentException(e); + } + } + + /** Add the hooks to the interceptors + */ + public void stop() + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + try + { + if (phaseOneInterceptors != null) + { + for (ObjectName oname : phaseOneInterceptors) + { + DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); + interceptor.removePhaseOneHook(this); + } + } + + if (phaseTwoInterceptors != null) + { + for (ObjectName oname : phaseTwoInterceptors) + { + DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); + interceptor.removePhaseTwoHook(this); + } + } + } + catch (MBeanProxyCreationException e) + { + throw new WSDeploymentException(e); + } + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHookEJB.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookEJB.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHookEJB.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHookEJB.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +/** + * An abstract deployer for EJB Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook +{ +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHookJSE.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookJSE.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHookJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHookJSE.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; + +//$Id$ + +/** + * An abstract deployer for JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook +{ + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if ((unit.metaData instanceof WebMetaData) == false) + return false; + + return true; + } + + static class Servlet + { + String servletName; + String servletClass; + public Servlet(String servletName, String servletClass) + { + this.servletName = servletName; + this.servletClass = servletClass; + } + public String getServletClass() + { + return servletClass; + } + public String getServletName() + { + return servletName; + } + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ApplicationMetaDataAdapter.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ApplicationMetaDataAdapter extends AbstractApplicationMetaDataAdapter +{ + protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) + { + UnifiedBeanMetaData ubmd = null; + if (bmd instanceof SessionMetaData) + { + ubmd = new UnifiedSessionMetaData(); + } + else if (bmd instanceof MessageDrivenMetaData) + { + ubmd = new UnifiedMessageDrivenMetaData(); + ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); + } + + if (ubmd != null) + { + ubmd.setEjbName(bmd.getEjbName()); + ubmd.setEjbClass(bmd.getEjbClass()); + ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); + ubmd.setHome(bmd.getHome()); + ubmd.setLocalHome(bmd.getLocalHome()); + ubmd.setJndiName(bmd.getJndiName()); + ubmd.setLocalJndiName(bmd.getLocalJndiName()); + + EjbPortComponentMetaData pcmd = bmd.getPortComponent(); + if (pcmd != null) + { + UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); + upcmd.setPortComponentName(pcmd.getPortComponentName()); + upcmd.setPortComponentURI(pcmd.getPortComponentURI()); + upcmd.setAuthMethod(pcmd.getAuthMethod()); + upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); + upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setPortComponent(upcmd); + } + } + return ubmd; + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ArchiveDeployerHook.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ArchiveDeployerHook.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ArchiveDeployerHook.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ArchiveDeployerHook.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,157 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.WSDeploymentException; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.metadata.webservices.WebservicesFactory; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.w3c.dom.Element; + +/** + * An abstract web service deployer. + * + * deploy(unit) + * if(isWebServiceDeployment) + * dep = createDeployment(unit) + * deploy(dep) + * + * undeploy(unit) + * dep = getDeployment(unit) + * undeploy(dep) + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class ArchiveDeployerHook extends AbstractDeployerHook +{ + /** Get the deployemnt type this deployer can handle + */ + public abstract DeploymentType getDeploymentType(); + + /** Depending on the type of deployment, this method should return true + * if the deployment contains web service endpoints. + */ + public abstract boolean isWebServiceDeployment(DeploymentInfo unit); + + /** Create the Deployment for a given DeploymentInfo + */ + public abstract Deployment createDeployment(DeploymentInfo unit); + + /** Get the Deployment for a given DeploymentInfo + */ + public Deployment getDeployment(DeploymentInfo unit) + { + Deployment dep = (Deployment)unit.context.get(Deployment.class); + return (dep != null && dep.getType() == getDeploymentType() ? dep : null); + } + + public void deploy(DeploymentInfo unit) throws DeploymentException + { + if (ignoreDeployment(unit)) + return; + + if (isWebServiceDeployment(unit)) + { + log.debug("deploy: " + unit.shortName); + Deployment dep = getDeployment(unit); + if (dep == null) + { + dep = createDeployment(unit); + dep.getContext().addAttachment(DeploymentInfo.class, unit); + } + + deployerManager.deploy(dep); + unit.context.put(Deployment.class, dep); + } + } + + public void undeploy(DeploymentInfo unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = getDeployment(unit); + if (dep != null) + { + log.debug("undeploy: " + unit.shortName); + deployerManager.undeploy(dep); + unit.context.remove(Deployment.class); + } + } + + /** Unmrashall the webservices.xml if there is one + */ + protected WebservicesMetaData getWebservicesMetaData(DeploymentInfo unit, String wsFile) + { + WebservicesMetaData wsMetaData = (WebservicesMetaData)unit.context.get(WebservicesMetaData.class); + UnifiedVirtualFile vfWebservices = getWebservicesFile(unit, wsFile); + if (wsMetaData == null && vfWebservices != null) + { + try + { + URL wsURL = vfWebservices.toURL(); + Element root = DOMUtils.parse(wsURL.openStream()); + String namespaceURI = root.getNamespaceURI(); + if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) + { + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + ObjectModelFactory factory = new WebservicesFactory(wsURL); + wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); + unit.context.put(WebservicesMetaData.class, wsMetaData); + } + } + catch (Exception ex) + { + throw new WSDeploymentException(ex); + } + } + return wsMetaData; + } + + private UnifiedVirtualFile getWebservicesFile(DeploymentInfo unit, String wsFile) + { + try + { + UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(unit.localCl); + return (wsFile != null ? vfsRoot.findChild(wsFile) : null); + } + catch (IOException e) + { + return null; + } + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ClassLoaderInjectionDeployer.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ClassLoaderInjectionDeployer.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ClassLoaderInjectionDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ClassLoaderInjectionDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.WSDeploymentException; + +/** + * A deployer that injects the correct classloader into the UMDM + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ClassLoaderInjectionDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployement unit"); + + ClassLoader classLoader = unit.ucl; + + // Get the webapp context classloader and use it as the deploymet class loader + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + classLoader = webMetaData.getContextLoader(); + } + + dep.setClassLoader(classLoader); + + // Reload target beans with the updated class loader + for (Endpoint ep : dep.getService().getEndpoints()) + { + Class targetBean = ep.getTargetBean(); + if (targetBean != null) + { + String beanName = targetBean.getName(); + if (targetBean.getClassLoader() != classLoader) + { + try + { + targetBean = classLoader.loadClass(beanName); + ep.setTargetBean(targetBean); + } + catch (ClassNotFoundException e) + { + throw new WSDeploymentException("Cannot reload target bean: " + beanName); + } + } + } + } + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapter.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,168 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.ejb3.Ejb3ModuleMBean; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.deployment.WSDeploymentException; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; + +/** + * Build container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class DeploymentInfoAdapter +{ + // logging support + private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); + + private WebMetaDataAdapter webMetaDataAdapter; + private AbstractApplicationMetaDataAdapter appMetaDataAdapter; + + public void setAppMetaDataAdapter(AbstractApplicationMetaDataAdapter applicationMetaDataAdapter) + { + this.appMetaDataAdapter = applicationMetaDataAdapter; + } + + public void setWebMetaDataAdapter(WebMetaDataAdapter webMetaDataAdapter) + { + this.webMetaDataAdapter = webMetaDataAdapter; + } + + public UnifiedDeploymentInfo buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentInfo di) + { + udi.addAttachment(DeploymentInfo.class, di); + + if (di.parent != null) + { + udi.parent = new UnifiedDeploymentInfo(null); + buildDeploymentInfo(udi.parent, di.parent); + } + + udi.vfRoot = new ResourceLoaderAdapter(di.localCl); + udi.name = di.getCanonicalName(); + udi.simpleName = di.shortName; + udi.url = getDeploymentURL(di); + udi.classLoader = di.annotationsCl; + udi.deployedObject = di.deployedObject; + + buildMetaData(udi, di.metaData); + + log.debug("UnifiedDeploymentInfo:\n" + udi); + return udi; + } + + private URL getDeploymentURL(DeploymentInfo di) + { + URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); + if ("file".equals(deploymentURL.getProtocol())) + { + String path = deploymentURL.getPath(); + if (new File(path).isFile()) + { + try + { + deploymentURL = new URL("jar:file:" + path + "!/"); + } + catch (MalformedURLException e) + { + // ignore + } + } + } + return deploymentURL; + } + + private void buildMetaData(UnifiedDeploymentInfo udi, Object metaData) + { + if (metaData instanceof WebMetaData) + { + udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(udi, (WebMetaData)metaData); + udi.webappURL = udi.url; + } + else if (metaData instanceof ApplicationMetaData) + { + udi.metaData = appMetaDataAdapter.buildUnifiedApplicationMetaData(udi, (ApplicationMetaData)metaData); + } + else if (udi.deployedObject != null) + { + Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); + + ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + for (Object container : ejb3Module.getContainers().values()) + { + if (container instanceof StatelessContainer) + { + StatelessContainer slc = (StatelessContainer)container; + UnifiedBeanMetaData uslc = new UnifiedBeanMetaData(); + uslc.setEjbName(slc.getEjbName()); + uslc.setEjbClass(slc.getBeanClassName()); + beans.add(uslc); + } + } + + UnifiedApplicationMetaData appMetaData = new UnifiedApplicationMetaData(); + appMetaData.setEnterpriseBeans(beans); + udi.metaData = appMetaData; + } + } + + public static Ejb3ModuleMBean getEJB3Module(ObjectName objectName) + { + Ejb3ModuleMBean ejb3Module; + try + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); + if (ejb3Module == null) + throw new WSDeploymentException("Cannot obtain EJB3 module: " + objectName); + + return ejb3Module; + } + catch (MBeanProxyCreationException ex) + { + throw new WSDeploymentException("Cannot obtain proxy to EJB3 module"); + } + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.integration.KernelLocator; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 10-Mar-2007 + */ +public class DeploymentInfoAdapterFactory +{ + // Hide ctor + private DeploymentInfoAdapterFactory() + { + } + + public static DeploymentInfoAdapter newInstance() + { + KernelRegistry registry = KernelLocator.getKernel().getRegistry(); + KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter"); + return (DeploymentInfoAdapter)entry.getTarget(); + } +} Added: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB21.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB21.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,166 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import java.lang.reflect.Method; +import java.security.Principal; + +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.ws.WebServiceException; + +import org.jboss.ejb.EjbModule; +import org.jboss.ejb.Interceptor; +import org.jboss.ejb.StatelessSessionContainer; +import org.jboss.invocation.Invocation; +import org.jboss.invocation.InvocationKey; +import org.jboss.invocation.InvocationType; +import org.jboss.invocation.PayloadKey; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.security.SecurityAssociation; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.invocation.AbstractInvocationHandler; +import org.jboss.ws.integration.invocation.HandlerCallback; +import org.jboss.ws.integration.invocation.EndpointInvocation; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * Handles invocations on EJB3 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerEJB21 extends AbstractInvocationHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class); + + private String jndiName; + private MBeanServer server; + private ObjectName objectName; + + public void create(Endpoint ep) + { + super.create(ep); + + ObjectName epName = ep.getName(); + String ejbName = epName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (ejbName == null) + throw new WebServiceException("Cannot obtain ejb-link from port component"); + + UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); + UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; + UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); + if (beanMetaData == null) + throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); + + // get the bean's JNDI name + jndiName = beanMetaData.getContainerObjectNameJndiName(); + if (jndiName == null) + throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName); + + server = MBeanServerLocator.locateJBoss(); + objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB"); + if (server.isRegistered(objectName) == false) + throw new WebServiceException("Cannot find service endpoint target: " + objectName); + + // Dynamically add the service endpoint interceptor + // http://jira.jboss.org/jira/browse/JBWS-758 + try + { + EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule"); + StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName); + + boolean injectionPointFound = false; + Interceptor prev = container.getInterceptor(); + while (prev != null && prev.getNext() != null) + { + Interceptor next = prev.getNext(); + if (next.getNext() == null) + { + log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName()); + ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor(); + prev.setNext(sepInterceptor); + sepInterceptor.setNext(next); + injectionPointFound = true; + } + prev = next; + } + if (injectionPointFound == false) + log.warn("Cannot service endpoint interceptor injection point"); + } + catch (Exception ex) + { + log.warn("Cannot add service endpoint interceptor", ex); + } + + } + + public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception + { + log.debug("Invoke: " + epInv.getJavaMethod().getName()); + + // these are provided by the ServerLoginHandler + Principal principal = SecurityAssociation.getPrincipal(); + Object credential = SecurityAssociation.getCredential(); + + // invoke on the container + try + { + // setup the invocation + Method method = epInv.getJavaMethod(); + Object[] args = epInv.getArgs(); + Invocation inv = new Invocation(null, method, args, null, principal, credential); + + // EJB2.1 endpoints will only get an JAXRPC context + MessageContext msgContext = epInv.getInvocationContext().getAttachment(MessageContext.class); + if (msgContext == null) + throw new IllegalStateException("Cannot obtain MessageContext"); + + HandlerCallback callback = epInv.getInvocationContext().getAttachment(HandlerCallback.class); + if (callback == null) + throw new IllegalStateException("Cannot obtain HandlerCallback"); + + inv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext); + inv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage()); + inv.setType(InvocationType.SERVICE_ENDPOINT); + inv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT); + inv.setValue(EndpointInvocation.class.getName(), epInv, PayloadKey.TRANSIENT); + + String[] sig = { org.jboss.invocation.Invocation.class.getName() }; + Object retObj = server.invoke(objectName, "invoke", new Object[] { inv }, sig); + epInv.setReturnValue(retObj); + } + catch (Exception e) + { + handleInvocationException(e); + } + } +} Property changes on: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB3.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB3.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,145 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import java.lang.reflect.Method; + +import javax.ejb.EJBContext; +import javax.management.ObjectName; +import javax.xml.ws.WebServiceException; + +import org.jboss.aop.Dispatcher; +import org.jboss.aop.MethodInfo; +import org.jboss.ejb3.BeanContext; +import org.jboss.ejb3.BeanContextLifecycleCallback; +import org.jboss.ejb3.EJBContainerInvocation; +import org.jboss.ejb3.stateless.StatelessBeanContext; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.injection.lang.reflect.BeanProperty; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.invocation.AbstractInvocationHandler; +import org.jboss.ws.integration.invocation.EndpointInvocation; +import org.jboss.ws.integration.invocation.WebServiceContextEJB; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * Handles invocations on EJB3 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerEJB3 extends AbstractInvocationHandler +{ + private ObjectName objectName; + + public void create(Endpoint ep) + { + super.create(ep); + + String ejbName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (ejbName == null) + throw new WebServiceException("Cannot obtain ejb-link"); + + UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); + String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; + if (udi.parent != null) + { + nameStr += ",ear=" + udi.parent.simpleName; + } + + objectName = ObjectNameFactory.create(nameStr.toString()); + } + + public void start(Endpoint ep) + { + super.start(ep); + + Dispatcher dispatcher = Dispatcher.singleton; + if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) + throw new WebServiceException("Cannot find service endpoint target: " + objectName); + } + + public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception + { + try + { + Dispatcher dispatcher = Dispatcher.singleton; + StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(objectName.getCanonicalName()); + Class beanClass = container.getBeanClass(); + + Method method = getImplMethod(beanClass, epInv.getJavaMethod()); + Object[] args = epInv.getArgs(); + + MethodInfo info = container.getMethodInfo(method); + EJBContainerInvocation<StatelessContainer, StatelessBeanContext> ejb3Inv = new EJBContainerInvocation<StatelessContainer, StatelessBeanContext>(info); + ejb3Inv.setAdvisor(container); + ejb3Inv.setArguments(args); + ejb3Inv.setContextCallback(new CallbackImpl(epInv)); + + Object retObj = ejb3Inv.invokeNext(); + + epInv.setReturnValue(retObj); + } + catch (Throwable th) + { + handleInvocationException(th); + } + } + + static class CallbackImpl implements BeanContextLifecycleCallback + { + private javax.xml.ws.handler.MessageContext jaxwsMessageContext; + private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext; + + public CallbackImpl(EndpointInvocation epInv) + { + jaxrpcMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class); + jaxwsMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.ws.handler.MessageContext.class); + } + + public void attached(BeanContext beanCtx) + { + StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; + sbc.setMessageContextJAXRPC(jaxrpcMessageContext); + + BeanProperty beanProp = sbc.getWebServiceContextProperty(); + if (beanProp != null) + { + EJBContext ejbCtx = beanCtx.getEJBContext(); + beanProp.set(beanCtx.getInstance(), new WebServiceContextEJB(jaxwsMessageContext, ejbCtx)); + } + } + + public void released(BeanContext beanCtx) + { + StatelessBeanContext sbc = (StatelessBeanContext)beanCtx; + sbc.setMessageContextJAXRPC(null); + + BeanProperty beanProp = sbc.getWebServiceContextProperty(); + if (beanProp != null) + beanProp.set(beanCtx.getInstance(), null); + } + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/InvocationHandlerEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXRPCDeployerHookEJB21.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXRPCDeployerHookEJB21.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXRPCDeployerHookEJB21.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,120 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.metadata.webservices.PortComponentMetaData; +import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXRPC EJB21 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_EJB21; + } + + @Override + public Deployment createDeployment(DeploymentInfo unit) + { + Deployment dep = createDeployment(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.ucl); + + Service service = dep.getService(); + + ApplicationMetaData appmd = (ApplicationMetaData)unit.metaData; + if (appmd == null) + throw new IllegalStateException("Deployment unit does not contain application meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, null); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); + dep.getContext().addAttachment(ApplicationMetaData.class, appmd); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String ejbLink = pcmd.getEjbLink(); + if (ejbLink == null) + throw new IllegalStateException("ejb-link cannot be null"); + + BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink); + if (beanMetaData == null) + throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); + + String ejbClass = beanMetaData.getEjbClass(); + try + { + ClassLoader loader = unit.ucl; + Class<?> epBean = loader.loadClass(ejbClass.trim()); + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setService(service); + ep.setTargetBean(epBean); + + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; + ep.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(ep); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + ejbClass); + } + } + } + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if ((unit.metaData instanceof ApplicationMetaData) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "META-INF/webservices.xml"); + return wsMetaData != null; + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXRPCDeployerHookJSE.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXRPCDeployerHookJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXRPCDeployerHookJSE.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,147 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.metadata.webservices.PortComponentMetaData; +import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_JSE; + } + + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentInfo unit) + { + Deployment dep = createDeployment(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.annotationsCl); + + Service service = dep.getService(); + + WebMetaData webMetaData = (WebMetaData)unit.metaData; + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); + dep.getContext().addAttachment(WebMetaData.class, webMetaData); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String servletLink = pcmd.getServletLink(); + if (servletLink == null) + throw new IllegalStateException("servlet-link cannot be null"); + + Servlet servlet = getServletForName(webMetaData, servletLink); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = dep.getClassLoader(); + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // If this is a servlet we defer the the bean creation + if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) + { + epBean = null; + } + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setService(service); + ep.setTargetBean(epBean); + + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; + ep.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(ep); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + } + } + } + + return dep; + } + + private Servlet getServletForName(WebMetaData wmd, String servletLink) + { + Iterator it = wmd.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClass = (String)entry.getValue(); + if (servletLink.equals(servletName)) + { + return new Servlet(servletName, servletClass); + } + } + throw new IllegalStateException("Cannot find servlet for link: " + servletLink); + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); + return wsMetaData != null; + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXWSDeployerHookEJB3.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXWSDeployerHookEJB3.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXWSDeployerHookEJB3.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,124 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3ModuleMBean; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXWS EJB3 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_EJB3; + } + + @Override + public Deployment createDeployment(DeploymentInfo unit) + { + Deployment dep = createDeployment(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.ucl); + + Service service = dep.getService(); + + Ejb3ModuleMBean ejb3Module = DeploymentInfoAdapter.getEJB3Module(unit.deployedObject); + for (Object manager : ejb3Module.getContainers().values()) + { + if (manager instanceof EJBContainer) + { + EJBContainer container = (EJBContainer)manager; + if (isWebServiceBean(container)) + { + String ejbName = container.getEjbName(); + Class epBean = container.getBeanClass(); + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setService(service); + ep.setTargetBean(epBean); + + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; + ep.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(ep); + } + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + boolean isWebserviceDeployment = false; + + // Check if the ejb3 contains annotated endpoints + Ejb3ModuleMBean ejb3Module = DeploymentInfoAdapter.getEJB3Module(unit.deployedObject); + for (Object manager : ejb3Module.getContainers().values()) + { + if (manager instanceof EJBContainer) + { + EJBContainer container = (EJBContainer)manager; + if (isWebServiceBean(container)) + { + isWebserviceDeployment = true; + break; + } + } + } + + return isWebserviceDeployment; + } + + private boolean isWebServiceBean(EJBContainer container) + { + boolean isWebServiceBean = false; + if (container instanceof StatelessContainer) + { + boolean isWebService = container.resolveAnnotation(WebService.class) != null; + boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; + isWebServiceBean = isWebService || isWebServiceProvider; + } + return isWebServiceBean; + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXWSDeployerHookJSE.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXWSDeployerHookJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/JAXWSDeployerHookJSE.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,156 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXWS JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_JSE; + } + + @Override + public Deployment createDeployment(DeploymentInfo unit) + { + Deployment dep = createDeployment(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.annotationsCl); + + Service service = dep.getService(); + + WebMetaData webMetaData = (WebMetaData)unit.metaData; + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebMetaData.class, webMetaData); + + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); + for (Servlet servlet : servlets) + { + String servletName = servlet.getServletName(); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = unit.annotationsCl; + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // Create the endpoint + Endpoint ep = createEndpoint(); + ep.setService(service); + ep.setTargetBean(epBean); + + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; + ep.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(ep); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + continue; + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentInfo unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + boolean isWebServiceDeployment = false; + try + { + WebMetaData webMetaData = (WebMetaData)unit.metaData; + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); + isWebServiceDeployment = servlets.size() > 0; + } + catch (Exception ex) + { + log.error("Cannot process web deployment", ex); + } + + return isWebServiceDeployment; + } + + private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) + { + List<Servlet> servlets = new ArrayList<Servlet>(); + Iterator it = webMetaData.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClassName = (String)entry.getValue(); + + // Skip JSPs + if (servletClassName == null || servletClassName.length() == 0) + continue; + + try + { + Class<?> servletClass = loader.loadClass(servletClassName.trim()); + boolean isWebService = servletClass.isAnnotationPresent(WebService.class); + boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); + if (isWebService || isWebServiceProvider) + servlets.add(new Servlet(servletName, servletClassName)); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + continue; + } + } + return servlets; + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/MainDeployerHook.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/MainDeployerHook.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/MainDeployerHook.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/MainDeployerHook.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.ws.integration.deployment.Deployment; + +/** + * A basic hook that delegates a deployment manger. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class MainDeployerHook extends AbstractDeployerHook +{ + public void deploy(DeploymentInfo unit) throws DeploymentException + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = (Deployment)unit.context.get(Deployment.class); + if (dep != null) + { + deployerManager.deploy(dep); + } + } + + public void undeploy(DeploymentInfo unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = (Deployment)unit.context.get(Deployment.class); + if (dep != null) + { + deployerManager.undeploy(dep); + } + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ModifyWebMetaDataDeployer.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ModifyWebMetaDataDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ModifyWebMetaDataDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.ServiceEndpointPublisher; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.deployment.ServiceEndpointPublisher.RewriteResults; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ModifyWebMetaDataDeployer extends AbstractDeployer +{ + private ServiceEndpointPublisher serviceEndpointPublisher; + + public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) + { + this.serviceEndpointPublisher = serviceEndpointPublisher; + } + + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + RewriteResults results = serviceEndpointPublisher.rewriteWebXml(udi); + + // The endpoint may not have a target bean when + // <servlet-class> originally contained a javax.servlet.Servlet + for (Endpoint ep : dep.getService().getEndpoints()) + { + if (ep.getTargetBean() == null) + { + String servletName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + String beanName = results.sepTargetMap.get(servletName); + if (beanName == null) + throw new IllegalStateException("Cannot obtain target bean for: " + servletName); + + try + { + ClassLoader loader = dep.getClassLoader(); + Class<?> epBean = loader.loadClass(beanName); + ep.setTargetBean(epBean); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load target bean: " + beanName); + } + } + } + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityRolesHandlerEJB21.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB21.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityRolesHandlerEJB21.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityRolesHandlerEJB21.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import java.util.Iterator; +import java.util.Map; + +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.AssemblyDescriptorMetaData; +import org.jboss.ws.integration.deployment.SecurityRolesHandler; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.utils.DOMUtils; +import org.w3c.dom.Element; + +/** + * Generate a service endpoint deployment for EJB endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class SecurityRolesHandlerEJB21 implements SecurityRolesHandler +{ + // logging support + protected Logger log = Logger.getLogger(SecurityRolesHandlerEJB21.class); + + /** Add the roles from ejb-jar.xml to the security roles + */ + public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) + { + // Fix: http://jira.jboss.org/jira/browse/JBWS-309 + ApplicationMetaData applMetaData = (ApplicationMetaData)udi.getAttachment(ApplicationMetaData.class); + AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor(); + if (assemblyDescriptor != null) + { + Map securityRoles = assemblyDescriptor.getSecurityRoles(); + if (securityRoles != null) + { + Iterator it = securityRoles.keySet().iterator(); + while (it.hasNext()) + { + Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); + Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); + roleName.appendChild(DOMUtils.createTextNode((String)it.next())); + } + } + } + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityRolesHandlerEJB3.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB3.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityRolesHandlerEJB3.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/SecurityRolesHandlerEJB3.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import javax.annotation.security.RolesAllowed; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.ejb3.Ejb3ModuleMBean; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.integration.deployment.SecurityRolesHandler; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.deployment.WSDeploymentException; +import org.jboss.ws.utils.DOMUtils; +import org.w3c.dom.Element; + +/** + * Generate a service endpoint deployment for EJB endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class SecurityRolesHandlerEJB3 implements SecurityRolesHandler +{ + // logging support + protected Logger log = Logger.getLogger(SecurityRolesHandlerEJB3.class); + + /** Add the roles from ejb-jar.xml to the security roles + */ + public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) + { + // The container objects below provide access to all of the ejb metadata + Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); + for (Object manager : ejb3Module.getContainers().values()) + { + if (manager instanceof StatelessContainer) + { + StatelessContainer container = (StatelessContainer)manager; + + RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class); + if (anRolesAllowed != null) + { + for (String role : anRolesAllowed.value()) + { + Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); + Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); + roleName.appendChild(DOMUtils.createTextNode(role)); + } + } + } + } + } + + private Ejb3ModuleMBean getEJB3Module(ObjectName objectName) + { + Ejb3ModuleMBean ejb3Module; + try + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); + if (ejb3Module == null) + throw new WSDeploymentException("Cannot obtain EJB3 module: " + objectName); + + return ejb3Module; + } + catch (MBeanProxyCreationException ex) + { + throw new WSDeploymentException("Cannot obtain proxy to EJB3 module"); + } + } +} Added: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInterceptor.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInterceptor.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInterceptor.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,127 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import javax.xml.rpc.handler.soap.SOAPMessageContext; + +import org.jboss.ejb.plugins.AbstractInterceptor; +import org.jboss.invocation.Invocation; +import org.jboss.invocation.InvocationKey; +import org.jboss.logging.Logger; +import org.jboss.ws.integration.invocation.HandlerCallback; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; + +/** + * This Interceptor does the ws4ee handler processing. + * + * According to the ws4ee spec the handler logic must be invoked after the container + * applied method level security to the invocation. + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Sep-2005 + */ +public class ServiceEndpointInterceptor extends AbstractInterceptor +{ + // provide logging + private static Logger log = Logger.getLogger(ServiceEndpointInterceptor.class); + + // Interceptor implementation -------------------------------------- + + /** Before and after we call the service endpoint bean, we process the handler chains. + */ + public Object invoke(final Invocation mi) throws Exception + { + // If no msgContext, it's not for us + SOAPMessageContext msgContext = (SOAPMessageContext)mi.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); + if (msgContext == null) + { + return getNext().invoke(mi); + } + + // Get the endpoint invocation + org.jboss.ws.integration.invocation.EndpointInvocation epInv = (org.jboss.ws.integration.invocation.EndpointInvocation)mi + .getValue(org.jboss.ws.integration.invocation.EndpointInvocation.class.getName()); + + // Get the handler callback + HandlerCallback callback = (HandlerCallback)mi.getValue(HandlerCallback.class.getName()); + + // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor. + if (callback != null && epInv != null) + { + try + { + // call the request handlers + boolean handlersPass = callback.callRequestHandlerChain(HandlerType.ENDPOINT); + handlersPass = handlersPass && callback.callRequestHandlerChain(HandlerType.POST); + + // Call the next interceptor in the chain + if (handlersPass) + { + // The SOAPContentElements stored in the EndpointInvocation might have changed after + // handler processing. Get the updated request payload. This should be a noop if request + // handlers did not modify the incomming SOAP message. + Object[] reqParams = epInv.getArgs(); + mi.setArguments(reqParams); + Object resObj = getNext().invoke(mi); + + // Setting the message to null should trigger binding of the response message + msgContext.setMessage(null); + epInv.setReturnValue(resObj); + } + + // call the response handlers + handlersPass = callback.callResponseHandlerChain(HandlerType.POST); + handlersPass = handlersPass && callback.callResponseHandlerChain(HandlerType.ENDPOINT); + + // update the return value after response handler processing + Object resObj = epInv.getReturnValue(); + + return resObj; + } + catch (Exception ex) + { + try + { + // call the fault handlers + boolean handlersPass = callback.callFaultHandlerChain(HandlerType.POST, ex); + handlersPass = handlersPass && callback.callFaultHandlerChain(HandlerType.ENDPOINT, ex); + } + catch (Exception subEx) + { + log.warn("Cannot process handlerChain.handleFault, ignoring: ", subEx); + } + throw ex; + } + finally + { + // do nothing + } + } + else + { + log.warn("Handler callback not available"); + return getNext().invoke(mi); + } + } +} Property changes on: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointInterceptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/UnifiedDeploymentInfoDeployer.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/UnifiedDeploymentInfoDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/UnifiedDeploymentInfoDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +//$Id$ + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.JAXRPCDeployment; +import org.jboss.ws.integration.deployment.JAXWSDeployment; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; + +/** + * A deployer that builds the UnifiedDeploymentInfo + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class UnifiedDeploymentInfoDeployer extends AbstractDeployer +{ + private DeploymentInfoAdapter deploymentInfoAdapter; + + public void setDeploymentInfoAdapter(DeploymentInfoAdapter deploymentInfoAdapter) + { + this.deploymentInfoAdapter = deploymentInfoAdapter; + } + + @Override + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + { + DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployment unit"); + + DeploymentType type = dep.getType(); + if (type.toString().startsWith("JAXWS")) + { + udi = new JAXWSDeployment(type); + deploymentInfoAdapter.buildDeploymentInfo(udi, unit); + } + else + { + WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); + udi = new JAXRPCDeployment(type, wsMetaData); + deploymentInfoAdapter.buildDeploymentInfo(udi, unit); + } + + dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); + } + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebAppDeployerDeployer.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebAppDeployerDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebAppDeployerDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import java.net.URL; + +import javax.management.MBeanServer; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.deployment.MainDeployerMBean; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.ServiceEndpointPublisher; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.deployment.WSDeploymentException; + +/** + * Publish the HTTP service endpoint to Tomcat + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class WebAppDeployerDeployer extends AbstractDeployer +{ + // provide logging + private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class); + + private ServiceEndpointPublisher serviceEndpointPublisher; + + public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) + { + this.serviceEndpointPublisher = serviceEndpointPublisher; + } + + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + URL warURL = udi.webappURL; + + log.debug("publishServiceEndpoint: " + warURL); + try + { + DeploymentInfo di = udi.getAttachment(DeploymentInfo.class); + if (di == null) + throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); + + serviceEndpointPublisher.rewriteWebXml(udi); + + // Preserve the repository config + DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); + auxdi.repositoryConfig = di.getTopRepositoryConfig(); + getMainDeployer().deploy(auxdi); + } + catch (Exception ex) + { + WSDeploymentException.rethrow(ex); + } + } + + public void destroy(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + URL warURL = udi.webappURL; + if (warURL == null) + { + log.error("Cannot obtain warURL for: " + udi.name); + return; + } + + log.debug("destroyServiceEndpoint: " + warURL); + try + { + getMainDeployer().undeploy(warURL); + } + catch (Exception ex) + { + WSDeploymentException.rethrow(ex); + } + } + + private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); + return mainDeployer; + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java (from rev 3110, branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebMetaDataAdapter.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,122 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42; + +// $Id$ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; + +/** + * Build container independent web meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class WebMetaDataAdapter +{ + public UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi, WebMetaData webMetaData) + { + udi.addAttachment(WebMetaData.class, webMetaData); + + UnifiedWebMetaData umd = new UnifiedWebMetaData(); + umd.setContextRoot(webMetaData.getContextRoot()); + umd.setServletMappings(webMetaData.getServletMappings()); + umd.setServletClassNames(getServletClassMap(webMetaData)); + umd.setConfigName(webMetaData.getConfigName()); + umd.setConfigFile(webMetaData.getConfigFile()); + umd.setSecurityDomain(webMetaData.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(webMetaData)); + umd.setSecurityMetaData(getSecurityMetaData(webMetaData.getSecurityContraints())); + + return umd; + } + + private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + return wmd.getWsdlPublishLocationByName(name); + } + }; + } + + private List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + HashMap resources = securityMetaData.getWebResources(); + for (Object webResourceObj : resources.values()) + { + WebResourceCollection webResource = (WebResourceCollection)webResourceObj; + UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + + } + + return unifiedsecurityMetaData; + } + + private Map<String, String> getServletClassMap(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClass = (String)entry.getValue(); + // Skip JSPs + if (servletClass != null) + mappings.put(servletName, servletClass); + } + return mappings; + } +} Modified: branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -28,7 +28,7 @@ <target name="thirdparty-get" depends="thirdparty-init" description="Gets the thirdparty libraries"/> - <target name="thirdparty-classpath" depends="thirdparty-init"> + <target name="thirdparty-classpath" depends="thirdparty-get">  <path id="jbws50.integration.classpath"> Deleted: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractInvocationHandler.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractInvocationHandler.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractInvocationHandler.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,119 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss50; - -// $Id$ - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.UndeclaredThrowableException; - -import javax.management.MBeanException; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.invocation.InvocationHandler; - -/** - * Handles invocations on endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractInvocationHandler implements InvocationHandler -{ - // provide logging - private static final Logger log = Logger.getLogger(AbstractInvocationHandler.class); - - protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException - { - String methodName = seiMethod.getName(); - Class[] paramTypes = seiMethod.getParameterTypes(); - for (int i = 0; i < paramTypes.length; i++) - { - Class paramType = paramTypes[i]; - if (JavaUtils.isPrimitive(paramType) == false) - { - String paramTypeName = paramType.getName(); - paramType = JavaUtils.loadJavaType(paramTypeName); - paramTypes[i] = paramType; - } - } - - Method implMethod = implClass.getMethod(methodName, paramTypes); - return implMethod; - } - - protected void handleInvocationException(Throwable th) throws Exception - { - if (th instanceof InvocationTargetException) - { - // unwrap the throwable raised by the service endpoint implementation - Throwable targetEx = ((InvocationTargetException)th).getTargetException(); - handleInvocationThrowable(targetEx); - } - - if (th instanceof MBeanException) - { - throw ((MBeanException)th).getTargetException(); - } - - handleInvocationThrowable(th); - } - - private void handleInvocationThrowable(Throwable th) throws Exception - { - if (th instanceof Exception) - { - throw (Exception)th; - } - else if (th instanceof Error) - { - throw (Error)th; - } - else - { - throw new UndeclaredThrowableException(th); - } - } - - public void create(Endpoint ep) - { - log.debug("Create: " + ep.getName()); - } - - public void start(Endpoint ep) - { - log.debug("Start: " + ep.getName()); - } - - public void stop(Endpoint ep) - { - log.debug("Stop: " + ep.getName()); - } - - public void destroy(Endpoint ep) - { - log.debug("Destroy: " + ep.getName()); - } -} Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB21.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB21.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -44,8 +44,9 @@ import org.jboss.security.SecurityAssociation; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.invocation.AbstractInvocationHandler; +import org.jboss.ws.integration.invocation.EndpointInvocation; import org.jboss.ws.integration.invocation.HandlerCallback; -import org.jboss.ws.integration.invocation.EndpointInvocation; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.utils.ObjectNameFactory; Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB3.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB3.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -39,6 +39,7 @@ import org.jboss.injection.lang.reflect.BeanProperty; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.invocation.AbstractInvocationHandler; import org.jboss.ws.integration.invocation.EndpointInvocation; import org.jboss.ws.integration.invocation.WebServiceContextEJB; import org.jboss.ws.utils.ObjectNameFactory; Deleted: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,100 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss50; - -// $Id$ - -import java.lang.reflect.Method; - -import javax.xml.rpc.server.ServiceLifecycle; -import javax.xml.rpc.server.ServletEndpointContext; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.WebServiceException; - -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.invocation.EndpointInvocation; -import org.jboss.ws.integration.invocation.InvocationContext; -import org.jboss.ws.integration.invocation.WebServiceContextInjector; - -/** - * Handles invocations on JSE endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class InvocationHandlerJSE extends AbstractInvocationHandler -{ - private Object targetBean; - - public void create(Endpoint ep) - { - try - { - Class epImpl = ep.getTargetBean(); - targetBean = epImpl.newInstance(); - } - catch (Exception ex) - { - throw new WebServiceException("Cannot load target bean"); - } - } - - public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception - { - try - { - InvocationContext invContext = epInv.getInvocationContext(); - WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class); - if (wsContext != null) - { - new WebServiceContextInjector().injectContext(targetBean, (WebServiceContext)wsContext); - } - - if (targetBean instanceof ServiceLifecycle) - { - ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class); - if (sepContext == null) - throw new IllegalStateException("Cannot obtain ServletEndpointContext"); - - ((ServiceLifecycle)targetBean).init(sepContext); - } - - try - { - Method method = getImplMethod(ep.getTargetBean(), epInv.getJavaMethod()); - Object retObj = method.invoke(targetBean, epInv.getArgs()); - epInv.setReturnValue(retObj); - } - finally - { - if (targetBean instanceof ServiceLifecycle) - { - ((ServiceLifecycle)targetBean).destroy(); - } - } - } - catch (Exception e) - { - handleInvocationException(e); - } - } -} Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.deployment.Deployer; +import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; import org.jboss.ws.integration.deployment.ServiceEndpointPublisher; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; @@ -46,7 +46,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 12-May-2006 */ -public class WebAppDeployerDeployer implements Deployer +public class WebAppDeployerDeployer extends AbstractDeployer { // provide logging private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class); @@ -127,12 +127,4 @@ VirtualFile file = VFS.getRoot(warURL); return new AbstractDeploymentContext(file); } - - public void start(Deployment dep) - { - } - - public void stop(Deployment dep) - { - } } Modified: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -28,33 +28,7 @@ <target name="thirdparty-get" depends="thirdparty-init" description="Gets the thirdparty libraries"/> - <target name="thirdparty-classpath" depends="thirdparty-init"> - -  - <path id="jbws42.integration.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${int.jboss42.dir}/output/lib/jbossws-jboss42.jar"/> - - <pathelement location="${jboss42.lib}/jboss-common.jar"/> - <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> - <pathelement location="${jboss42.lib}/jboss-system.jar"/> - <pathelement location="${jboss42.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss42.server.lib}/jboss.jar"/> - <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/> - <pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/> - <pathelement location="${jboss42.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss42.server.lib}/servlet-api.jar"/> - <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/> - <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/> - <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - </path> - + <target name="thirdparty-classpath" depends="thirdparty-get"> </target> </project> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractApplicationMetaDataAdapter.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractApplicationMetaDataAdapter.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractApplicationMetaDataAdapter.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -// $Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public abstract class AbstractApplicationMetaDataAdapter -{ - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, ApplicationMetaData apmd) - { - udi.addAttachment(ApplicationMetaData.class, apmd); - - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, apmd); - umd.setConfigName(apmd.getConfigName()); - umd.setConfigFile(apmd.getConfigFile()); - umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot()); - umd.setSecurityDomain(apmd.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd)); - return umd; - } - - protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd) - { - return new PublishLocationAdapter () - { - public String getWsdlPublishLocationByName(String name) - { - return apmd.getWsdlPublishLocationByName(name); - } - }; - } - - protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData) - { - List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - Iterator it = metaData.getEnterpriseBeans(); - while (it.hasNext()) - { - BeanMetaData bmd = (BeanMetaData)it.next(); - UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd); - if (ubmd != null) - { - beans.add(ubmd); - } - } - umd.setEnterpriseBeans(beans); - } - - protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd); -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,202 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import java.util.List; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.DeployerManager; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.WSDeploymentException; -import org.jboss.ws.integration.jboss42.DeployerHook; -import org.jboss.ws.integration.jboss42.DeployerInterceptorMBean; - -/** - * An abstract web service deployer. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHook implements DeployerHook -{ - // provide logging - protected final Logger log = Logger.getLogger(getClass()); - - protected DeployerManager deployerManager; - private List<ObjectName> phaseOneInterceptors; - private List<ObjectName> phaseTwoInterceptors; - private String deploymentClass; - private String serviceClass; - private String endpointClass; - - public void setDeployerManager(DeployerManager deploymentManager) - { - this.deployerManager = deploymentManager; - } - - public void setDeploymentClass(String deploymentClass) - { - this.deploymentClass = deploymentClass; - } - - public void setEndpointClass(String endpointClass) - { - this.endpointClass = endpointClass; - } - - public void setServiceClass(String serviceClass) - { - this.serviceClass = serviceClass; - } - - public Deployment createDeployment() - { - try - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class<?> clazz = loader.loadClass(deploymentClass); - return (Deployment)clazz.newInstance(); - } - catch (Exception ex) - { - throw new WSDeploymentException("Cannot load: " + deploymentClass); - } - } - - public Service createService() - { - try - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class<?> clazz = loader.loadClass(serviceClass); - return (Service)clazz.newInstance(); - } - catch (Exception ex) - { - throw new WSDeploymentException("Cannot load: " + serviceClass); - } - } - - public Endpoint createEndpoint() - { - try - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class<?> clazz = loader.loadClass(endpointClass); - return (Endpoint)clazz.newInstance(); - } - catch (Exception ex) - { - throw new WSDeploymentException("Cannot load: " + endpointClass); - } - } - - public void setPhaseOneInterceptors(List<ObjectName> phaseOneInterceptors) - { - this.phaseOneInterceptors = phaseOneInterceptors; - } - - public void setPhaseTwoInterceptors(List<ObjectName> phaseTwoInterceptors) - { - this.phaseTwoInterceptors = phaseTwoInterceptors; - } - - /** Return true if this deployment should be ignored - */ - public boolean ignoreDeployment(DeploymentInfo unit) - { - return false; - } - - /** Add the hooks to the interceptors - */ - public void start() - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - try - { - if (phaseOneInterceptors != null) - { - for (ObjectName oname : phaseOneInterceptors) - { - DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); - interceptor.addPhaseOneHook(this); - } - } - - if (phaseTwoInterceptors != null) - { - for (ObjectName oname : phaseTwoInterceptors) - { - DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); - interceptor.addPhaseTwoHook(this); - } - } - } - catch (MBeanProxyCreationException e) - { - throw new WSDeploymentException(e); - } - } - - /** Add the hooks to the interceptors - */ - public void stop() - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - try - { - if (phaseOneInterceptors != null) - { - for (ObjectName oname : phaseOneInterceptors) - { - DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); - interceptor.removePhaseOneHook(this); - } - } - - if (phaseTwoInterceptors != null) - { - for (ObjectName oname : phaseTwoInterceptors) - { - DeployerInterceptorMBean interceptor = (DeployerInterceptorMBean)MBeanProxy.get(DeployerInterceptorMBean.class, oname, server); - interceptor.removePhaseTwoHook(this); - } - } - } - catch (MBeanProxyCreationException e) - { - throw new WSDeploymentException(e); - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookEJB.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookEJB.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookEJB.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -/** - * An abstract deployer for EJB Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook -{ -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookJSE.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHookJSE.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; - -//$Id$ - -/** - * An abstract deployer for JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook -{ - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if ((unit.metaData instanceof WebMetaData) == false) - return false; - - return true; - } - - static class Servlet - { - String servletName; - String servletClass; - public Servlet(String servletName, String servletClass) - { - this.servletName = servletName; - this.servletClass = servletClass; - } - public String getServletClass() - { - return servletClass; - } - public String getServletName() - { - return servletName; - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ApplicationMetaDataAdapter.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ApplicationMetaDataAdapter.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ApplicationMetaDataAdapter.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -// $Id$ - -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ApplicationMetaDataAdapter extends AbstractApplicationMetaDataAdapter -{ - protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) - { - UnifiedBeanMetaData ubmd = null; - if (bmd instanceof SessionMetaData) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (bmd instanceof MessageDrivenMetaData) - { - ubmd = new UnifiedMessageDrivenMetaData(); - ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); - } - - if (ubmd != null) - { - ubmd.setEjbName(bmd.getEjbName()); - ubmd.setEjbClass(bmd.getEjbClass()); - ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); - ubmd.setHome(bmd.getHome()); - ubmd.setLocalHome(bmd.getLocalHome()); - ubmd.setJndiName(bmd.getJndiName()); - ubmd.setLocalJndiName(bmd.getLocalJndiName()); - - EjbPortComponentMetaData pcmd = bmd.getPortComponent(); - if (pcmd != null) - { - UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); - upcmd.setPortComponentName(pcmd.getPortComponentName()); - upcmd.setPortComponentURI(pcmd.getPortComponentURI()); - upcmd.setAuthMethod(pcmd.getAuthMethod()); - upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); - upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); - ubmd.setPortComponent(upcmd); - } - } - return ubmd; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ArchiveDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ArchiveDeployerHook.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ArchiveDeployerHook.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,157 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import java.io.IOException; -import java.net.URL; - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.WSDeploymentException; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.webservices.WebservicesFactory; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.DOMUtils; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.w3c.dom.Element; - -/** - * An abstract web service deployer. - * - * deploy(unit) - * if(isWebServiceDeployment) - * dep = createDeployment(unit) - * deploy(dep) - * - * undeploy(unit) - * dep = getDeployment(unit) - * undeploy(dep) - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class ArchiveDeployerHook extends AbstractDeployerHook -{ - /** Get the deployemnt type this deployer can handle - */ - public abstract DeploymentType getDeploymentType(); - - /** Depending on the type of deployment, this method should return true - * if the deployment contains web service endpoints. - */ - public abstract boolean isWebServiceDeployment(DeploymentInfo unit); - - /** Create the Deployment for a given DeploymentInfo - */ - public abstract Deployment createDeployment(DeploymentInfo unit); - - /** Get the Deployment for a given DeploymentInfo - */ - public Deployment getDeployment(DeploymentInfo unit) - { - Deployment dep = (Deployment)unit.context.get(Deployment.class); - return (dep != null && dep.getType() == getDeploymentType() ? dep : null); - } - - public void deploy(DeploymentInfo unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - if (isWebServiceDeployment(unit)) - { - log.debug("deploy: " + unit.shortName); - Deployment dep = getDeployment(unit); - if (dep == null) - { - dep = createDeployment(unit); - dep.getContext().addAttachment(DeploymentInfo.class, unit); - } - - deployerManager.deploy(dep); - unit.context.put(Deployment.class, dep); - } - } - - public void undeploy(DeploymentInfo unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = getDeployment(unit); - if (dep != null) - { - log.debug("undeploy: " + unit.shortName); - deployerManager.undeploy(dep); - unit.context.remove(Deployment.class); - } - } - - /** Unmrashall the webservices.xml if there is one - */ - protected WebservicesMetaData getWebservicesMetaData(DeploymentInfo unit, String wsFile) - { - WebservicesMetaData wsMetaData = (WebservicesMetaData)unit.context.get(WebservicesMetaData.class); - UnifiedVirtualFile vfWebservices = getWebservicesFile(unit, wsFile); - if (wsMetaData == null && vfWebservices != null) - { - try - { - URL wsURL = vfWebservices.toURL(); - Element root = DOMUtils.parse(wsURL.openStream()); - String namespaceURI = root.getNamespaceURI(); - if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(wsURL); - wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); - unit.context.put(WebservicesMetaData.class, wsMetaData); - } - } - catch (Exception ex) - { - throw new WSDeploymentException(ex); - } - } - return wsMetaData; - } - - private UnifiedVirtualFile getWebservicesFile(DeploymentInfo unit, String wsFile) - { - try - { - UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(unit.localCl); - return (wsFile != null ? vfsRoot.findChild(wsFile) : null); - } - catch (IOException e) - { - return null; - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ClassLoaderInjectionDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ClassLoaderInjectionDeployer.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ClassLoaderInjectionDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.deployment.AbstractDeployer; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.WSDeploymentException; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; - -/** - * A deployer that injects the correct classloader into the UMDM - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ClassLoaderInjectionDeployer extends AbstractDeployer -{ - @Override - public void create(Deployment dep) - { - DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployement unit"); - - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); - if (umd == null) - throw new IllegalStateException("Cannot obtain unified meta data"); - - ClassLoader classLoader = unit.ucl; - - // Get the webapp context classloader and use it as the deploymet class loader - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - classLoader = webMetaData.getContextLoader(); - } - - dep.setClassLoader(classLoader); - - // Reload target beans with the updated class loader - for (Endpoint ep : dep.getService().getEndpoints()) - { - Class targetBean = ep.getTargetBean(); - if (targetBean != null) - { - String beanName = targetBean.getName(); - if (targetBean.getClassLoader() != classLoader) - { - try - { - targetBean = classLoader.loadClass(beanName); - ep.setTargetBean(targetBean); - } - catch (ClassNotFoundException e) - { - throw new WSDeploymentException("Cannot reload target bean: " + beanName); - } - } - } - } - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapter.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapter.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapter.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,168 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -// $Id$ - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.WSException; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; - -/** - * Build container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class DeploymentInfoAdapter -{ - // logging support - private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); - - private WebMetaDataAdapter webMetaDataAdapter; - private AbstractApplicationMetaDataAdapter appMetaDataAdapter; - - public void setAppMetaDataAdapter(AbstractApplicationMetaDataAdapter applicationMetaDataAdapter) - { - this.appMetaDataAdapter = applicationMetaDataAdapter; - } - - public void setWebMetaDataAdapter(WebMetaDataAdapter webMetaDataAdapter) - { - this.webMetaDataAdapter = webMetaDataAdapter; - } - - public UnifiedDeploymentInfo buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentInfo di) - { - udi.addAttachment(DeploymentInfo.class, di); - - if (di.parent != null) - { - udi.parent = new UnifiedDeploymentInfo(null); - buildDeploymentInfo(udi.parent, di.parent); - } - - udi.vfRoot = new ResourceLoaderAdapter(di.localCl); - udi.name = di.getCanonicalName(); - udi.simpleName = di.shortName; - udi.url = getDeploymentURL(di); - udi.classLoader = di.annotationsCl; - udi.deployedObject = di.deployedObject; - - buildMetaData(udi, di.metaData); - - log.debug("UnifiedDeploymentInfo:\n" + udi); - return udi; - } - - private URL getDeploymentURL(DeploymentInfo di) - { - URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); - if ("file".equals(deploymentURL.getProtocol())) - { - String path = deploymentURL.getPath(); - if (new File(path).isFile()) - { - try - { - deploymentURL = new URL("jar:file:" + path + "!/"); - } - catch (MalformedURLException e) - { - // ignore - } - } - } - return deploymentURL; - } - - private void buildMetaData(UnifiedDeploymentInfo udi, Object metaData) - { - if (metaData instanceof WebMetaData) - { - udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(udi, (WebMetaData)metaData); - udi.webappURL = udi.url; - } - else if (metaData instanceof ApplicationMetaData) - { - udi.metaData = appMetaDataAdapter.buildUnifiedApplicationMetaData(udi, (ApplicationMetaData)metaData); - } - else if (udi.deployedObject != null) - { - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); - - ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - for (Object container : ejb3Module.getContainers().values()) - { - if (container instanceof StatelessContainer) - { - StatelessContainer slc = (StatelessContainer)container; - UnifiedBeanMetaData uslc = new UnifiedBeanMetaData(); - uslc.setEjbName(slc.getEjbName()); - uslc.setEjbClass(slc.getBeanClassName()); - beans.add(uslc); - } - } - - UnifiedApplicationMetaData appMetaData = new UnifiedApplicationMetaData(); - appMetaData.setEnterpriseBeans(beans); - udi.metaData = appMetaData; - } - } - - public static Ejb3ModuleMBean getEJB3Module(ObjectName objectName) - { - Ejb3ModuleMBean ejb3Module; - try - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); - if (ejb3Module == null) - throw new WSException("Cannot obtain EJB3 module: " + objectName); - - return ejb3Module; - } - catch (MBeanProxyCreationException ex) - { - throw new WSException("Cannot obtain proxy to EJB3 module"); - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -// $Id$ - -import org.jboss.kernel.spi.registry.KernelRegistry; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 10-Mar-2007 - */ -public class DeploymentInfoAdapterFactory -{ - // Hide ctor - private DeploymentInfoAdapterFactory() - { - } - - public static DeploymentInfoAdapter newInstance() - { - KernelRegistry registry = KernelLocator.getKernel().getRegistry(); - KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter"); - return (DeploymentInfoAdapter)entry.getTarget(); - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookEJB21.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.webservices.PortComponentMetaData; -import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXRPC EJB21 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_EJB21; - } - - @Override - public Deployment createDeployment(DeploymentInfo unit) - { - Deployment dep = createDeployment(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.ucl); - - Service service = dep.getService(); - - ApplicationMetaData appmd = (ApplicationMetaData)unit.metaData; - if (appmd == null) - throw new IllegalStateException("Deployment unit does not contain application meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, null); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(ApplicationMetaData.class, appmd); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String ejbLink = pcmd.getEjbLink(); - if (ejbLink == null) - throw new IllegalStateException("ejb-link cannot be null"); - - BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink); - if (beanMetaData == null) - throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); - - String ejbClass = beanMetaData.getEjbClass(); - try - { - ClassLoader loader = unit.ucl; - Class<?> epBean = loader.loadClass(ejbClass.trim()); - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + ejbClass); - } - } - } - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if ((unit.metaData instanceof ApplicationMetaData) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "META-INF/webservices.xml"); - return wsMetaData != null; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXRPCDeployerHookJSE.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,147 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.webservices.PortComponentMetaData; -import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_JSE; - } - - /** - * Create an endpoint for every servlet-link in webservices.xml - */ - @Override - public Deployment createDeployment(DeploymentInfo unit) - { - Deployment dep = createDeployment(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.annotationsCl); - - Service service = dep.getService(); - - WebMetaData webMetaData = (WebMetaData)unit.metaData; - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(WebMetaData.class, webMetaData); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String servletLink = pcmd.getServletLink(); - if (servletLink == null) - throw new IllegalStateException("servlet-link cannot be null"); - - Servlet servlet = getServletForName(webMetaData, servletLink); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = dep.getClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // If this is a servlet we defer the the bean creation - if (javax.servlet.Servlet.class.isAssignableFrom(epBean)) - { - epBean = null; - } - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - } - } - } - - return dep; - } - - private Servlet getServletForName(WebMetaData wmd, String servletLink) - { - Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); - if (servletLink.equals(servletName)) - { - return new Servlet(servletName, servletClass); - } - } - throw new IllegalStateException("Cannot find servlet for link: " + servletLink); - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit, "WEB-INF/webservices.xml"); - return wsMetaData != null; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookEJB3.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,124 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXWS EJB3 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_EJB3; - } - - @Override - public Deployment createDeployment(DeploymentInfo unit) - { - Deployment dep = createDeployment(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.ucl); - - Service service = dep.getService(); - - Ejb3ModuleMBean ejb3Module = DeploymentInfoAdapter.getEJB3Module(unit.deployedObject); - for (Object manager : ejb3Module.getContainers().values()) - { - if (manager instanceof EJBContainer) - { - EJBContainer container = (EJBContainer)manager; - if (isWebServiceBean(container)) - { - String ejbName = container.getEjbName(); - Class epBean = container.getBeanClass(); - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - boolean isWebserviceDeployment = false; - - // Check if the ejb3 contains annotated endpoints - Ejb3ModuleMBean ejb3Module = DeploymentInfoAdapter.getEJB3Module(unit.deployedObject); - for (Object manager : ejb3Module.getContainers().values()) - { - if (manager instanceof EJBContainer) - { - EJBContainer container = (EJBContainer)manager; - if (isWebServiceBean(container)) - { - isWebserviceDeployment = true; - break; - } - } - } - - return isWebserviceDeployment; - } - - private boolean isWebServiceBean(EJBContainer container) - { - boolean isWebServiceBean = false; - if (container instanceof StatelessContainer) - { - boolean isWebService = container.resolveAnnotation(WebService.class) != null; - boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; - isWebServiceBean = isWebService || isWebServiceProvider; - } - return isWebServiceBean; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/JAXWSDeployerHookJSE.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,156 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXWS JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_JSE; - } - - @Override - public Deployment createDeployment(DeploymentInfo unit) - { - Deployment dep = createDeployment(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.annotationsCl); - - Service service = dep.getService(); - - WebMetaData webMetaData = (WebMetaData)unit.metaData; - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebMetaData.class, webMetaData); - - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); - for (Servlet servlet : servlets) - { - String servletName = servlet.getServletName(); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = unit.annotationsCl; - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // Create the endpoint - Endpoint ep = createEndpoint(); - ep.setService(service); - ep.setTargetBean(epBean); - - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; - ep.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(ep); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - continue; - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentInfo unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - boolean isWebServiceDeployment = false; - try - { - WebMetaData webMetaData = (WebMetaData)unit.metaData; - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.annotationsCl); - isWebServiceDeployment = servlets.size() > 0; - } - catch (Exception ex) - { - log.error("Cannot process web deployment", ex); - } - - return isWebServiceDeployment; - } - - private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) - { - List<Servlet> servlets = new ArrayList<Servlet>(); - Iterator it = webMetaData.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClassName = (String)entry.getValue(); - - // Skip JSPs - if (servletClassName == null || servletClassName.length() == 0) - continue; - - try - { - Class<?> servletClass = loader.loadClass(servletClassName.trim()); - boolean isWebService = servletClass.isAnnotationPresent(WebService.class); - boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); - if (isWebService || isWebServiceProvider) - servlets.add(new Servlet(servletName, servletClassName)); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClassName); - continue; - } - } - return servlets; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/MainDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/MainDeployerHook.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/MainDeployerHook.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.ws.integration.deployment.Deployment; - -/** - * A basic hook that delegates a deployment manger. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class MainDeployerHook extends AbstractDeployerHook -{ - public void deploy(DeploymentInfo unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = (Deployment)unit.context.get(Deployment.class); - if (dep != null) - { - deployerManager.deploy(dep); - } - } - - public void undeploy(DeploymentInfo unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = (Deployment)unit.context.get(Deployment.class); - if (dep != null) - { - deployerManager.undeploy(dep); - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,85 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.deployment.AbstractDeployer; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.ServiceEndpointPublisher; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.integration.deployment.ServiceEndpointPublisher.RewriteResults; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ModifyWebMetaDataDeployer extends AbstractDeployer -{ - private ServiceEndpointPublisher serviceEndpointPublisher; - - public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) - { - this.serviceEndpointPublisher = serviceEndpointPublisher; - } - - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - RewriteResults results = serviceEndpointPublisher.rewriteWebXml(udi); - - // The endpoint may not have a target bean when - // <servlet-class> originally contained a javax.servlet.Servlet - for (Endpoint ep : dep.getService().getEndpoints()) - { - if (ep.getTargetBean() == null) - { - String servletName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - String beanName = results.sepTargetMap.get(servletName); - if (beanName == null) - throw new IllegalStateException("Cannot obtain target bean for: " + servletName); - - try - { - ClassLoader loader = dep.getClassLoader(); - Class<?> epBean = loader.loadClass(beanName); - ep.setTargetBean(epBean); - - ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); - sepMetaData.setServiceEndpointImplName(beanName); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load target bean: " + beanName); - } - - } - } - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB21.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB21.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,70 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import java.util.Iterator; -import java.util.Map; - -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.AssemblyDescriptorMetaData; -import org.jboss.ws.integration.deployment.SecurityRolesHandler; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * Generate a service endpoint deployment for EJB endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class SecurityRolesHandlerEJB21 implements SecurityRolesHandler -{ - // logging support - protected Logger log = Logger.getLogger(SecurityRolesHandlerEJB21.class); - - /** Add the roles from ejb-jar.xml to the security roles - */ - public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) - { - // Fix: http://jira.jboss.org/jira/browse/JBWS-309 - ApplicationMetaData applMetaData = (ApplicationMetaData)udi.getAttachment(ApplicationMetaData.class); - AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor(); - if (assemblyDescriptor != null) - { - Map securityRoles = assemblyDescriptor.getSecurityRoles(); - if (securityRoles != null) - { - Iterator it = securityRoles.keySet().iterator(); - while (it.hasNext()) - { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode((String)it.next())); - } - } - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB3.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityRolesHandlerEJB3.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,96 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import javax.annotation.security.RolesAllowed; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.WSException; -import org.jboss.ws.integration.deployment.SecurityRolesHandler; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * Generate a service endpoint deployment for EJB endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class SecurityRolesHandlerEJB3 implements SecurityRolesHandler -{ - // logging support - protected Logger log = Logger.getLogger(SecurityRolesHandlerEJB3.class); - - /** Add the roles from ejb-jar.xml to the security roles - */ - public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) - { - // The container objects below provide access to all of the ejb metadata - Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); - for (Object manager : ejb3Module.getContainers().values()) - { - if (manager instanceof StatelessContainer) - { - StatelessContainer container = (StatelessContainer)manager; - - RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class); - if (anRolesAllowed != null) - { - for (String role : anRolesAllowed.value()) - { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode(role)); - } - } - } - } - } - - private Ejb3ModuleMBean getEJB3Module(ObjectName objectName) - { - Ejb3ModuleMBean ejb3Module; - try - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); - if (ejb3Module == null) - throw new WSException("Cannot obtain EJB3 module: " + objectName); - - return ejb3Module; - } - catch (MBeanProxyCreationException ex) - { - throw new WSException("Cannot obtain proxy to EJB3 module"); - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -//$Id$ - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.ws.integration.deployment.AbstractDeployer; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.JAXRPCDeployment; -import org.jboss.ws.integration.deployment.JAXWSDeployment; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; - -/** - * A deployer that builds the UnifiedDeploymentInfo - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class UnifiedDeploymentInfoDeployer extends AbstractDeployer -{ - private DeploymentInfoAdapter deploymentInfoAdapter; - - public void setDeploymentInfoAdapter(DeploymentInfoAdapter deploymentInfoAdapter) - { - this.deploymentInfoAdapter = deploymentInfoAdapter; - } - - @Override - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - { - DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployment unit"); - - DeploymentType type = dep.getType(); - if (type.toString().startsWith("JAXWS")) - { - udi = new JAXWSDeployment(type); - deploymentInfoAdapter.buildDeploymentInfo(udi, unit); - } - else - { - WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); - udi = new JAXRPCDeployment(type, wsMetaData); - deploymentInfoAdapter.buildDeploymentInfo(udi, unit); - } - - dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); - } - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,126 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -// $Id$ - -import java.net.URL; - -import javax.management.MBeanServer; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.MainDeployerMBean; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.integration.deployment.Deployer; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.ServiceEndpointPublisher; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.integration.deployment.WSDeploymentException; - -/** - * Publish the HTTP service endpoint to Tomcat - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class WebAppDeployerDeployer implements Deployer -{ - // provide logging - private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class); - - private ServiceEndpointPublisher serviceEndpointPublisher; - - public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) - { - this.serviceEndpointPublisher = serviceEndpointPublisher; - } - - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - URL warURL = udi.webappURL; - - log.debug("publishServiceEndpoint: " + warURL); - try - { - DeploymentInfo di = udi.getAttachment(DeploymentInfo.class); - if (di == null) - throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); - - serviceEndpointPublisher.rewriteWebXml(udi); - - // Preserve the repository config - DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); - auxdi.repositoryConfig = di.getTopRepositoryConfig(); - getMainDeployer().deploy(auxdi); - } - catch (Exception ex) - { - WSDeploymentException.rethrow(ex); - } - } - - public void destroy(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - URL warURL = udi.webappURL; - if (warURL == null) - { - log.error("Cannot obtain warURL for: " + udi.name); - return; - } - - log.debug("destroyServiceEndpoint: " + warURL); - try - { - getMainDeployer().undeploy(warURL); - } - catch (Exception ex) - { - WSDeploymentException.rethrow(ex); - } - } - - public void start(Deployment dep) - { - } - - public void stop(Deployment dep) - { - } - - private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); - return mainDeployer; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebMetaDataAdapter.java =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebMetaDataAdapter.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebMetaDataAdapter.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,122 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42.jbossws; - -// $Id$ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.WebSecurityMetaData; -import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; - -/** - * Build container independent web meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class WebMetaDataAdapter -{ - public UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi, WebMetaData webMetaData) - { - udi.addAttachment(WebMetaData.class, webMetaData); - - UnifiedWebMetaData umd = new UnifiedWebMetaData(); - umd.setContextRoot(webMetaData.getContextRoot()); - umd.setServletMappings(webMetaData.getServletMappings()); - umd.setServletClassNames(getServletClassMap(webMetaData)); - umd.setConfigName(webMetaData.getConfigName()); - umd.setConfigFile(webMetaData.getConfigFile()); - umd.setSecurityDomain(webMetaData.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(webMetaData)); - umd.setSecurityMetaData(getSecurityMetaData(webMetaData.getSecurityContraints())); - - return umd; - } - - private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - return wmd.getWsdlPublishLocationByName(name); - } - }; - } - - private List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) - { - ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); - - while (securityConstraints.hasNext()) - { - WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); - - UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); - unifiedsecurityMetaData.add(current); - - current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); - - HashMap resources = securityMetaData.getWebResources(); - for (Object webResourceObj : resources.values()) - { - WebResourceCollection webResource = (WebResourceCollection)webResourceObj; - UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); - for (String currentPattern : webResource.getUrlPatterns()) - { - currentResource.addPattern(currentPattern); - } - } - - } - - return unifiedsecurityMetaData; - } - - private Map<String, String> getServletClassMap(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); - // Skip JSPs - if (servletClass != null) - mappings.put(servletName, servletClass); - } - return mappings; - } -} Modified: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -104,6 +104,7 @@ <inject bean="WSEndpointHandlerDeployer"/> <inject bean="WSPublishContractDeployer"/> <inject bean="WSClassLoaderInjectionDeployer"/> + <inject bean="WSServiceEndpointInvokerDeployer"/> <inject bean="WSEagerInitializeDeployer"/> <inject bean="WSEventingDeployer"/> <inject bean="WSEndpointRegistryDeployer"/> @@ -116,17 +117,17 @@ The Deployers Each handles a single aspect of web service deployment --> - <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss42.jbossws.ClassLoaderInjectionDeployer"/> + <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss42.ClassLoaderInjectionDeployer"/> <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.core.server.InvocationHandlerJSE</value></entry> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.ws.integration.jboss42.jbossws.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.core.server.InvocationHandlerJSE</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss42.jbossws.InvocationHandlerEJB3</value></entry> + <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXRPC_EJB21</key><value>org.jboss.ws.integration.jboss42.InvocationHandlerEJB21</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss42.InvocationHandlerEJB3</value></entry> </map> </property> </bean> @@ -134,35 +135,36 @@ <bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss42.jbossws.ModifyWebMetaDataDeployer"> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss42.ModifyWebMetaDataDeployer"> <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> </bean> <bean name="WSPublishContractDeployer" class="org.jboss.ws.core.deployment.PublishContractDeployer"/> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss42.jbossws.UnifiedDeploymentInfoDeployer"> + <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.ws.core.deployment.ServiceEndpointInvokerDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss42.UnifiedDeploymentInfoDeployer"> <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> </bean> <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataAssociationDeployer"/> <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataDeployer"/> - <bean name="WSWebAppGeneratorDeployer" class="org.jboss.ws.integration.jboss42.jbossws.WebAppGeneratorDeployer"/> - <bean name="WSWebAppDeployerDeployer" class="org.jboss.ws.integration.jboss42.jbossws.WebAppDeployerDeployer"> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.ws.core.deployment.WebAppGeneratorDeployer"/> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.ws.integration.jboss42.WebAppDeployerDeployer"> <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> </bean>  - <bean name="WSServiceEndpointPublisher" class="org.jboss.ws.core.deployment.ServiceEndpointPublisher"> + <bean name="WSServiceEndpointPublisher" class="org.jboss.ws.integration.deployment.ServiceEndpointPublisher"> <property name="servletClass">org.jboss.ws.core.server.ServiceEndpointServlet</property> </bean> - <bean name="WSDeploymentInfoAdapter" class="org.jboss.ws.integration.jboss42.jbossws.DeploymentInfoAdapter"> + <bean name="WSDeploymentInfoAdapter" class="org.jboss.ws.integration.jboss42.DeploymentInfoAdapter"> <property name="appMetaDataAdapter"><inject bean="WSAppMetaDataAdapter"/></property> <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> </bean> - <bean name="WSAppMetaDataAdapter" class="org.jboss.ws.integration.jboss42.jbossws.ApplicationMetaDataAdapter"/> - <bean name="WSWebMetaDataAdapter" class="org.jboss.ws.integration.jboss42.jbossws.WebMetaDataAdapter"/> + <bean name="WSAppMetaDataAdapter" class="org.jboss.ws.integration.jboss42.ApplicationMetaDataAdapter"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.ws.integration.jboss42.WebMetaDataAdapter"/>  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss42.jbossws.JAXRPCDeployerHookJSE"> + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss42.JAXRPCDeployerHookJSE"> <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> @@ -172,7 +174,7 @@ </list> </property> </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss42.jbossws.JAXRPCDeployerHookEJB21"> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss42.JAXRPCDeployerHookEJB21"> <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> @@ -182,7 +184,7 @@ </list> </property> </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss42.jbossws.JAXWSDeployerHookJSE"> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss42.JAXWSDeployerHookJSE"> <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> @@ -192,7 +194,7 @@ </list> </property> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss42.jbossws.JAXWSDeployerHookEJB3"> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss42.JAXWSDeployerHookEJB3"> <property name="deploymentClass">org.jboss.ws.core.deployment.UnifiedMetaDataDeployment</property> <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> @@ -202,7 +204,7 @@ </list> </property> </bean> - <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss42.jbossws.MainDeployerHook"> + <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss42.MainDeployerHook"> <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> Modified: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -32,30 +32,6 @@  <path id="jbws50.integration.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/> - - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> </path> </target> Modified: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -136,9 +136,9 @@ <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.integration.jboss50.InvocationHandlerJSE</value></entry> + <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> <entry><key>JAXRPC_EJB21</key><value>org.jboss.ws.integration.jboss50.InvocationHandlerEJB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.jboss50.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -108,7 +108,7 @@ } } - public RewriteResults rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception + private RewriteResults rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception { if (dest == null) { Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/AbstractInvocationHandler.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/AbstractInvocationHandler.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/AbstractInvocationHandler.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.invocation; + +// $Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.UndeclaredThrowableException; + +import javax.management.MBeanException; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.utils.JavaUtils; +import org.jboss.ws.integration.Endpoint; + +/** + * Handles invocations on endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractInvocationHandler implements InvocationHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(AbstractInvocationHandler.class); + + protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException + { + String methodName = seiMethod.getName(); + Class[] paramTypes = seiMethod.getParameterTypes(); + for (int i = 0; i < paramTypes.length; i++) + { + Class paramType = paramTypes[i]; + if (JavaUtils.isPrimitive(paramType) == false) + { + String paramTypeName = paramType.getName(); + paramType = JavaUtils.loadJavaType(paramTypeName); + paramTypes[i] = paramType; + } + } + + Method implMethod = implClass.getMethod(methodName, paramTypes); + return implMethod; + } + + protected void handleInvocationException(Throwable th) throws Exception + { + if (th instanceof InvocationTargetException) + { + // unwrap the throwable raised by the service endpoint implementation + Throwable targetEx = ((InvocationTargetException)th).getTargetException(); + handleInvocationThrowable(targetEx); + } + + if (th instanceof MBeanException) + { + throw ((MBeanException)th).getTargetException(); + } + + handleInvocationThrowable(th); + } + + private void handleInvocationThrowable(Throwable th) throws Exception + { + if (th instanceof Exception) + { + throw (Exception)th; + } + else if (th instanceof Error) + { + throw (Error)th; + } + else + { + throw new UndeclaredThrowableException(th); + } + } + + public void create(Endpoint ep) + { + log.debug("Create: " + ep.getName()); + } + + public void start(Endpoint ep) + { + log.debug("Start: " + ep.getName()); + } + + public void stop(Endpoint ep) + { + log.debug("Stop: " + ep.getName()); + } + + public void destroy(Endpoint ep) + { + log.debug("Destroy: " + ep.getName()); + } +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/AbstractInvocationHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandlerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandlerJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandlerJSE.java 2007-05-17 11:53:42 UTC (rev 3120) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.invocation; + +// $Id$ + +import java.lang.reflect.Method; + +import javax.xml.rpc.server.ServiceLifecycle; +import javax.xml.rpc.server.ServletEndpointContext; +import javax.xml.ws.WebServiceContext; + +import org.jboss.ws.integration.Endpoint; + +/** + * Handles invocations on JSE endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerJSE extends AbstractInvocationHandler +{ + protected Object getTargetBean(Endpoint ep) throws InstantiationException, IllegalAccessException + { + Class epImpl = ep.getTargetBean(); + Object targetBean = epImpl.newInstance(); + return targetBean; + } + + public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception + { + try + { + Object targetBean = getTargetBean(ep); + + InvocationContext invContext = epInv.getInvocationContext(); + WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class); + if (wsContext != null) + { + new WebServiceContextInjector().injectContext(targetBean, (WebServiceContext)wsContext); + } + + if (targetBean instanceof ServiceLifecycle) + { + ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class); + if (sepContext == null) + throw new IllegalStateException("Cannot obtain ServletEndpointContext"); + + ((ServiceLifecycle)targetBean).init(sepContext); + } + + try + { + Method method = getImplMethod(ep.getTargetBean(), epInv.getJavaMethod()); + Object retObj = method.invoke(targetBean, epInv.getArgs()); + epInv.setReturnValue(retObj); + } + finally + { + if (targetBean instanceof ServiceLifecycle) + { + ((ServiceLifecycle)targetBean).destroy(); + } + } + } + catch (Exception e) + { + handleInvocationException(e); + } + } +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandlerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/jbossws/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws/build.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/jbossws/build.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -31,6 +31,14 @@ <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + <target name="init" depends="prepare,thirdparty-get"> <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/> </target> Modified: branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -12,6 +12,14 @@ --> <target name="tests-init" depends="tests-prepare"> +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> +  <path id="javac.classpath"> <pathelement location="${spi.dir}/output/classes"/> Deleted: branches/tdiesler/trunk/testsuite/build.xml =================================================================== --- branches/tdiesler/trunk/testsuite/build.xml 2007-05-17 11:03:51 UTC (rev 3119) +++ branches/tdiesler/trunk/testsuite/build.xml 2007-05-17 11:53:42 UTC (rev 3120) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project default="main" basedir=".." name="JBossWS-Tests"> - - <import file="${basedir}/build/ant-import/build-setup.xml"/> - - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - -  -  -  - - <target name="clean" description="Delete all generated test files."> - <delete dir="${testsuite.dir}/output-tests"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" description="Builds almost everything." depends="tests-main"/> - - <target name="most" description="Builds almost everything." depends="main"/> - -</project>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3119 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-17 07:03:51 -0400 (Thu, 17 May 2007) New Revision: 3119 Removed: branches/dlofthouse/JBWS-1647/ Log: Branch no longer required.

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3118 - in branches/jbossws-2.0: jbossws-core/src/java/org/jboss/ws/core/jaxws/binding and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-17 06:57:34 -0400 (Thu, 17 May 2007) New Revision: 3118 Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml Removed: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java Log: JBWS-1647 - Text Node and Comment Preservation For Messages Sent Across The Wire Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -67,6 +67,7 @@ import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.core.soap.SOAPHeaderElementImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; +import org.jboss.ws.core.soap.TextImpl; import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; @@ -229,10 +230,10 @@ log.debug("Add unboundHeader element: " + soapName); SOAPContentElement contentElement = new SOAPHeaderElementImpl(soapName); contentElement.setParamMetaData(unboundHeader.toParameterMetaData(opMetaData)); - + if (soapHeader == null) soapHeader = soapEnvelope.addHeader(); - + soapHeader.addChildElement(contentElement); contentElement.setObjectValue(value); } @@ -291,7 +292,18 @@ SOAPElement soapBodyElement = soapBody; if (style == Style.RPC) { - soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + soapBodyElement = null; + + Iterator it = soapBody.getChildElements(); + while (soapBodyElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapBodyElement = (SOAPElement)current; + } + } + Name elName = soapBodyElement.getElementName(); QName elQName = new QName(elName.getURI(), elName.getLocalName(), elName.getPrefix()); @@ -537,8 +549,14 @@ Iterator bodyChildren = soapBody.getChildElements(); SOAPBodyElement soapBodyElement = null; - if (bodyChildren.hasNext() != false) - soapBodyElement = (SOAPBodyElement)bodyChildren.next(); + while (bodyChildren.hasNext() && soapBodyElement == null) + { + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } // Translate the SOAPFault to an exception and throw it if (soapBodyElement instanceof SOAPFaultImpl) @@ -804,8 +822,14 @@ Iterator childElements = soapElement.getChildElements(); while (childElements.hasNext()) { - SOAPElementImpl childElement = (SOAPElementImpl)childElements.next(); + Object child = childElements.next(); + if (child instanceof TextImpl) + { + continue; + } + SOAPElementImpl childElement = (SOAPElementImpl)child; + // If this message was manipulated by a handler the child may not be a content element if (!(childElement instanceof SOAPContentElement)) childElement = (SOAPContentElement)soapElement.replaceChild(new SOAPContentElement(childElement), childElement); Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -23,10 +23,12 @@ // $Id$ +import java.util.Iterator; import java.util.List; import java.util.Map; import javax.xml.namespace.QName; +import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPMessage; import javax.xml.transform.Source; import javax.xml.ws.handler.Handler; @@ -93,7 +95,18 @@ SOAPMessage reqMessage = (SOAPMessage)payload; SOAPBodyImpl body = (SOAPBodyImpl)reqMessage.getSOAPBody(); - SOAPContentElement bodyElement = (SOAPContentElement)body.getFirstChild(); + + SOAPContentElement bodyElement = null; + Iterator bodyChildren = body.getChildElements(); + while (bodyChildren.hasNext() && bodyElement == null) + { + Object next = bodyChildren.next(); + if (next instanceof SOAPContentElement) + { + bodyElement = (SOAPContentElement)next; + } + } + Source source = bodyElement.getXMLFragment().getSource(); if (source == null) Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -27,6 +27,7 @@ import java.lang.reflect.Method; import java.lang.reflect.UndeclaredThrowableException; import java.util.HashMap; +import java.util.Iterator; import javax.activation.DataHandler; import javax.management.MBeanException; @@ -344,9 +345,21 @@ { String faultString; SOAPBody soapBody = soapMessage.getSOAPBody(); - if (soapBody.getChildElements().hasNext()) + + Iterator bodyChildren = soapBody.getChildElements(); + SOAPBodyElement soapBodyElement = null; + + while (bodyChildren.hasNext() && soapBodyElement == null) { - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } + + if (soapBodyElement != null) + { Name soapName = soapBodyElement.getElementName(); faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName; } Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -63,14 +63,28 @@ String bodyStr = DOMWriter.printNode(soapBody, true); log.debug("Begin processHRefs:\n" + bodyStr); - SOAPBodyElement bodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPBodyElement bodyElement = null; + Iterator children = soapBody.getChildElements(); + while (bodyElement == null && children.hasNext()) + { + Object currentChild = children.next(); + if (currentChild instanceof SOAPBodyElement) + { + bodyElement = (SOAPBodyElement)currentChild; + } + } + processElement(bodyElement); - + Iterator it = soapBody.getChildElements(); while (it.hasNext()) { + Object currentChild = it.next(); + if (currentChild instanceof TextImpl) + continue; + // Remove id elements - SOAPElement soapElement = (SOAPElement)it.next(); + SOAPElement soapElement = (SOAPElement)currentChild; if ((soapElement instanceof SOAPBodyElement) == false) soapBody.removeChild(soapElement); } Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -143,7 +143,7 @@ } public SOAPElement setElementQNameInternal(QName qname) throws SOAPException - { + { elementName = new NameImpl(qname); Document owner = domNode.getOwnerDocument(); @@ -153,7 +153,6 @@ return this.completeNamespaceDeclaration(); } - /** * Adds an attribute with the specified name and value to this SOAPElement object. * @@ -465,9 +464,7 @@ } else if (node instanceof Text) { - String value = node.getNodeValue(); - if (value.trim().length() > 0) - list.add(node); + list.add(node); } } return list.iterator(); @@ -835,7 +832,14 @@ } else if (node instanceof TextImpl) { + boolean comment = node.getNodeType() == Node.COMMENT_NODE; + if (comment) + out.write(""); } else { Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPHeaderImpl.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -58,7 +58,7 @@ /** Add a SOAPHeaderElement as a child of this SOAPHeader instance. */ public SOAPElement addChildElement(SOAPElement child) throws SOAPException - { + { QName qname = child.getElementQName(); if (qname == null || qname.getNamespaceURI().length() == 0) throw new SOAPException("Invalid SOAPHeaderElement name: " + qname); @@ -111,8 +111,12 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + list.add(shElement); + } } return list.iterator(); } @@ -129,9 +133,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor())) - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor())) + list.add(shElement); + } } return list.iterator(); } @@ -149,9 +157,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor()) && shElement.getMustUnderstand()) - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor()) && shElement.getMustUnderstand()) + list.add(shElement); + } } return list.iterator(); } @@ -163,9 +175,13 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - removeChild(shElement); - list.add(shElement); + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) + { + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + removeChild(shElement); + list.add(shElement); + } } return list.iterator(); } @@ -180,11 +196,15 @@ Iterator it = getChildElements(); while (it.hasNext()) { - SOAPHeaderElement shElement = (SOAPHeaderElement)it.next(); - if (actor.equals(shElement.getActor())) + Object currentChild = it.next(); + if (currentChild instanceof SOAPHeaderElement) { - removeChild(shElement); - list.add(shElement); + SOAPHeaderElement shElement = (SOAPHeaderElement)currentChild; + if (actor.equals(shElement.getActor())) + { + removeChild(shElement); + list.add(shElement); + } } } return list.iterator(); Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -68,7 +68,8 @@ if (wsaAction.equals(opAux.getSOAPAction())) { opMetaData = opAux; - if(log.isDebugEnabled()) log.debug("Use wsa:Action dispatch: " + wsaAction); + if (log.isDebugEnabled()) + log.debug("Use wsa:Action dispatch: " + wsaAction); break; } } @@ -87,8 +88,19 @@ SOAPBody soapBody = soapMessage.getSOAPBody(); Iterator bodyChildren = soapBody.getChildElements(); - if (bodyChildren.hasNext() == false) + SOAPBodyElement soapBodyElement = null; + + while (bodyChildren.hasNext() && soapBodyElement == null) { + Object next = bodyChildren.next(); + if (next instanceof SOAPBodyElement) + { + soapBodyElement = (SOAPBodyElement)next; + } + } + + if (soapBodyElement == null) + { if (epMetaData.getStyle() == Style.RPC) throw new SOAPException("Empty SOAP body with no child element not supported for RPC"); @@ -97,7 +109,8 @@ { if (opAux.getParameters().size() == 0) { - if(log.isDebugEnabled()) log.debug ("Dispatching empty SOAP body"); + if (log.isDebugEnabled()) + log.debug("Dispatching empty SOAP body"); opMetaData = opAux; break; } @@ -105,7 +118,6 @@ } else { - SOAPBodyElement soapBodyElement = (SOAPBodyElement)bodyChildren.next(); Name soapName = soapBodyElement.getElementName(); QName xmlElementName = new QName(soapName.getURI(), soapName.getLocalName()); opMetaData = epMetaData.getOperation(xmlElementName); @@ -119,14 +131,16 @@ { if (opAux.isMessageEndpoint()) { - if(log.isDebugEnabled()) log.debug("Use generic message style dispatch"); + if (log.isDebugEnabled()) + log.debug("Use generic message style dispatch"); opMetaData = opAux; break; } } } - if(log.isDebugEnabled()) log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); + if (log.isDebugEnabled()) + log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); return opMetaData; } } \ No newline at end of file Modified: branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -2571,7 +2571,41 @@ <include name="wsdl/**"/> </metainf> </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-rpclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-doclit.war" + webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -28,18 +28,19 @@ import java.io.IOException; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamSource; import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.core.utils.DOMWriter; import org.w3c.dom.Element; @@ -82,7 +83,9 @@ assertEquals("env:Envelope", env.getNodeName()); assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI()); - SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements().next(); + Name name = new NameImpl("businessList", null, "urn:uddi-org:api_v2"); + SOAPBodyElement soapBodyElement = (SOAPBodyElement)env.getBody().getChildElements(name).next(); + assertEquals("urn:uddi-org:api_v2", soapBodyElement.getNamespaceURI()); } @@ -225,4 +228,38 @@ //System.out.println(wasXML); assertEquals(expXML, wasXML); } -} \ No newline at end of file + + public void testWriteToPreserveFormatting() throws Exception + { + String expMessage = + "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + " <soapenv:Header></soapenv:Header>" + + " <soapenv:Body>" + + " " + + " <typ:lookup xmlns:typ='http://www.jboss.org/support/phonebook/types'>" + + " " + + " <firstName>Joe</firstName>" + + " <surname>Bloggs</surname>" + + " " + + " </typ:lookup>" + + " " + + " </soapenv:Body>" + + "</soapenv:Envelope>"; + + MessageFactoryImpl factory = new MessageFactoryImpl(); + ByteArrayInputStream inputStream = new ByteArrayInputStream(expMessage.getBytes()); + SOAPMessage soapMsg = factory.createMessage(null, inputStream); + + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + soapMsg.writeTo(outputStream); + + String actualMessage = new String(outputStream.toByteArray(), "UTF-8"); + + //System.out.println("A - " + expMessage); + //System.out.println("B - " + DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), false)); + //System.out.println("C - " + actualMessage); + + assertEquals(expMessage, actualMessage); + } + +} Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -33,6 +33,7 @@ import javax.xml.soap.SOAPMessage; import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.core.soap.NameImpl; /** * Test the SOAPElement @@ -114,8 +115,10 @@ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(xml.getBytes())); SOAPFactory soapFactory = SOAPFactory.newInstance(); - SOAPElement bearElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next(); + Name name = new NameImpl("bear", "np", "http://northpole.net"); + SOAPElement bearElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements(name).next(); + assertEquals(2, getIteratorCount(bearElement.getAllAttributes())); Iterator it = bearElement.getAllAttributes(); Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPFaultTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -38,6 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.Constants; import org.jboss.ws.core.jaxrpc.SOAPFaultHelperJAXRPC; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.utils.DOMUtils; /** @@ -76,7 +77,10 @@ MessageFactory factory = MessageFactory.newInstance(); SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPFault soapFault = (SOAPFault)soapBody.getChildElements().next(); + + Name name = new NameImpl("Fault", "env", "http://schemas.xmlsoap.org/soap/envelope/"); + SOAPFault soapFault = (SOAPFault)soapBody.getChildElements(name).next(); + assertEquals("env:Client", soapFault.getFaultCode()); assertEquals("Some fault message", soapFault.getFaultString()); assertEquals("Some fault actor", soapFault.getFaultActor()); Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderElementTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -61,9 +61,10 @@ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); SOAPHeader soapHeader = soapEnv.getHeader(); - SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements().next(); - + Name name = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements(name).next(); + assertEquals(name, shElement.getElementName()); assertEquals("BradPitt", shElement.getActor()); @@ -86,9 +87,10 @@ SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(envStr.getBytes())); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); SOAPHeader soapHeader = soapEnv.getHeader(); - SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements().next(); - + Name name = new NameImpl("Bar", "ns2", "http://org.jboss.ws/header2"); + SOAPHeaderElement shElement = (SOAPHeaderElement)soapHeader.getChildElements(name).next(); + assertEquals(name, shElement.getElementName()); assertTrue(shElement.getMustUnderstand()); Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPHeaderTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -206,7 +206,7 @@ assertEquals("SomeHeaderValue", foo.getValue()); assertEquals("SomeOtherValue", bar.getValue()); - assertFalse(soapHeader.getChildElements().hasNext()); + assertFalse(soapHeader.examineAllHeaderElements().hasNext()); } public void testExtractHeaderElements() throws Exception @@ -234,7 +234,7 @@ assertEquals("SomeOtherValue", bar.getValue()); - Iterator childElements = soapHeader.getChildElements(); + Iterator childElements = soapHeader.examineAllHeaderElements(); SOAPHeaderElement foo = (SOAPHeaderElement)childElements.next(); Name fooName = new NameImpl("Foo", "ns1", "http://org.jboss.ws/header"); Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647 (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647) Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import java.io.ByteArrayOutputStream; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public abstract class AbstractHandler extends GenericHandler -{ - - private static final Logger log = Logger.getLogger(AbstractHandler.class); - - public abstract String getExpectedMessage(); - - public boolean handleRequest(MessageContext msgContext) - { - log.info("handleRequest"); - - boolean valid = false; - - SOAPMessageContext messageContext = (SOAPMessageContext)msgContext; - - SOAPMessage soapMessage = messageContext.getMessage(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - String receivedMessage = ""; - try - { - soapMessage.writeTo(baos); - receivedMessage = baos.toString(); - } - catch (Exception e) - { - throw new RuntimeException("Unable to process SOAPMessage", e); - } - - valid = getExpectedMessage().equals(receivedMessage); - if (valid == false) - { - log.error("Received message does not equal expected message."); - log.info("EXP - " + getExpectedMessage()); - log.info("ACT - " + receivedMessage); - - throw new RuntimeException("Received message does not equal expected message."); - } - - return valid; - } - - public QName[] getHeaders() - { - return null; - } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import java.io.ByteArrayOutputStream; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public abstract class AbstractHandler extends GenericHandler +{ + + private static final Logger log = Logger.getLogger(AbstractHandler.class); + + public abstract String getExpectedMessage(); + + public boolean handleRequest(MessageContext msgContext) + { + log.info("handleRequest"); + + boolean valid = false; + + SOAPMessageContext messageContext = (SOAPMessageContext)msgContext; + + SOAPMessage soapMessage = messageContext.getMessage(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + String receivedMessage = ""; + try + { + soapMessage.writeTo(baos); + receivedMessage = baos.toString(); + } + catch (Exception e) + { + throw new RuntimeException("Unable to process SOAPMessage", e); + } + + valid = getExpectedMessage().equals(receivedMessage); + if (valid == false) + { + log.error("Received message does not equal expected message."); + log.info("EXP - " + getExpectedMessage()); + log.info("ACT - " + receivedMessage); + + throw new RuntimeException("Received message does not equal expected message."); + } + + return valid; + } + + public QName[] getHeaders() + { + return null; + } + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class DocumentHandler extends AbstractHandler -{ - - public static final String MESSAGE = - "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + - " " + - " <soapenv:Header></soapenv:Header>" + - " " + - " <soapenv:Body>" + - " " + - " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + - " " + - " <String_1>My Message</String_1>" + - " " + - " </typ:echoMessage>" + - " " + - " </soapenv:Body>" + - " " + - "</soapenv:Envelope>"; - - public String getExpectedMessage() - { - return MESSAGE; - } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class DocumentHandler extends AbstractHandler +{ + + public static final String MESSAGE = + "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + + " " + + " <soapenv:Header></soapenv:Header>" + + " " + + " <soapenv:Body>" + + " " + + " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" + + " " + + " <String_1>My Message</String_1>" + + " " + + " </typ:echoMessage>" + + " " + + " </soapenv:Body>" + + " " + + "</soapenv:Envelope>"; + + public String getExpectedMessage() + { + return MESSAGE; + } + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class JBWS1647DocumentTestCase extends TestCaseBase -{ - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war"); - } - - public String getMessage() - { - return DocumentHandler.MESSAGE; - } - - public String getToUrl() - { - return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint"; - } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class JBWS1647DocumentTestCase extends TestCaseBase +{ + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war"); + } + + public String getMessage() + { + return DocumentHandler.MESSAGE; + } + + public String getToUrl() + { + return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint"; + } + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public class JBWS1647RPCTestCase extends TestCaseBase -{ - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war"); - } - - public String getMessage() - { - return RpcHandler.MESSAGE; - } - - public String getToUrl() - { - return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint"; - } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public class JBWS1647RPCTestCase extends TestCaseBase +{ + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war"); + } + + public String getMessage() + { + return RpcHandler.MESSAGE; + } + + public String getToUrl() + { + return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint"; + } + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public class RpcHandler extends AbstractHandler -{ - - public static final String MESSAGE = - "<soapenv:Envelope xmlns:jbw='http://org.jboss.test.ws/jbws1647' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + - " " + - " <soapenv:Header></soapenv:Header>" + - " " + - " <soapenv:Body>" + - " " + - " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" + - " " + - " <String_1>My Message</String_1>" + - " " + - " </jbw:echoMessage>" + - " " + - " </soapenv:Body>" + - " " + - "</soapenv:Envelope>"; - - public String getExpectedMessage() - { - return MESSAGE; - } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public class RpcHandler extends AbstractHandler +{ + + public static final String MESSAGE = + "<soapenv:Envelope xmlns:jbw='http://org.jboss.test.ws/jbws1647' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + + " " + + " <soapenv:Header></soapenv:Header>" + + " " + + " <soapenv:Body>" + + " " + + " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" + + " " + + " <String_1>My Message</String_1>" + + " " + + " </jbw:echoMessage>" + + " " + + " </soapenv:Body>" + + " " + + "</soapenv:Envelope>"; + + public String getExpectedMessage() + { + return MESSAGE; + } + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import java.io.ByteArrayInputStream; - -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import org.jboss.test.ws.JBossWSTest; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 15 May 2007 - */ -public abstract class TestCaseBase extends JBossWSTest -{ - - public abstract String getMessage(); - - public abstract String getToUrl(); - - public void testCall() throws Exception - { - MessageFactory msgFactory = MessageFactory.newInstance(); - SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes())); - - SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); - SOAPConnection con = conFactory.createConnection(); - SOAPMessage resMessage = con.call(soapMessage, getToUrl()); - - SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); - assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName()); - } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import java.io.ByteArrayInputStream; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPConnection; +import javax.xml.soap.SOAPConnectionFactory; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.test.ws.JBossWSTest; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 15 May 2007 + */ +public abstract class TestCaseBase extends JBossWSTest +{ + + public abstract String getMessage(); + + public abstract String getToUrl(); + + public void testCall() throws Exception + { + MessageFactory msgFactory = MessageFactory.newInstance(); + SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes())); + + SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance(); + SOAPConnection con = conFactory.createConnection(); + SOAPMessage resMessage = con.call(soapMessage, getToUrl()); + + SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next(); + assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName()); + } + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public interface TestEndpoint extends Remote -{ - - public String echoMessage(final String message) throws RemoteException; - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public interface TestEndpoint extends Remote +{ + + public String echoMessage(final String message) throws RemoteException; + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; - -import org.jboss.logging.Logger; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 14 May 2007 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - private static final Logger log = Logger.getLogger(TestEndpointImpl.class); - - public String echoMessage(final String message) - { - return message; - } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jaxrpc.jbws1647; + +import org.jboss.logging.Logger; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 14 May 2007 + */ +public class TestEndpointImpl implements TestEndpoint +{ + + private static final Logger log = Logger.getLogger(TestEndpointImpl.class); + + public String echoMessage(final String message) + { + return message; + } + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 15 11:14:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jaxrpc.jbws1647; - - -public class TestEndpoint_echoMessage_RequestStruct -{ - -protected java.lang.String string_1; -public TestEndpoint_echoMessage_RequestStruct(){} - -public TestEndpoint_echoMessage_RequestStruct(java.lang.String string_1){ -this.string_1=string_1; -} -public java.lang.String getString_1() { return string_1 ;} - -public void setString_1(java.lang.String string_1){ this.string_1=string_1; } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 15 11:14:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jaxrpc.jbws1647; + + +public class TestEndpoint_echoMessage_RequestStruct +{ + +protected java.lang.String string_1; +public TestEndpoint_echoMessage_RequestStruct(){} + +public TestEndpoint_echoMessage_RequestStruct(java.lang.String string_1){ +this.string_1=string_1; +} +public java.lang.String getString_1() { return string_1 ;} + +public void setString_1(java.lang.String string_1){ this.string_1=string_1; } + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,27 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Tue May 15 11:14:30 CEST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jaxrpc.jbws1647; - - -public class TestEndpoint_echoMessage_ResponseStruct -{ - -protected java.lang.String result; -public TestEndpoint_echoMessage_ResponseStruct(){} - -public TestEndpoint_echoMessage_ResponseStruct(java.lang.String result){ -this.result=result; -} -public java.lang.String getResult() { return result ;} - -public void setResult(java.lang.String result){ this.result=result; } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Tue May 15 11:14:30 CEST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jaxrpc.jbws1647; + + +public class TestEndpoint_echoMessage_ResponseStruct +{ + +protected java.lang.String result; +public TestEndpoint_echoMessage_ResponseStruct(){} + +public TestEndpoint_echoMessage_ResponseStruct(java.lang.String result){ +this.result=result; +} +public java.lang.String getResult() { return result ;} + +public void setResult(java.lang.String result){ this.result=result; } + +} Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -28,6 +28,7 @@ import javax.xml.rpc.Service; import javax.xml.soap.MessageFactory; import javax.xml.soap.MimeHeaders; +import javax.xml.soap.Name; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; @@ -37,6 +38,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.soap.NameImpl; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -115,7 +117,7 @@ String xmlStr = "<?xml version='1.0' encoding='UTF-8' ?>" + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:tns='http://uri.jboss.org'>" + " <env:Body>" + - " <tns:testMessage><![CDATA[ Hello ]]></tns:testMessage>" + + " <tns:myMessage><![CDATA[ Hello ]]></tns:myMessage>" + " </env:Body>" + "</env:Envelope>"; @@ -185,8 +187,10 @@ SOAPMessage soapMessage = mf.createMessage(mimeHeaders, new ByteArrayInputStream(xmlStr.getBytes())); SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next(); + Name name = new NameImpl("myMessage", "tns", "http://uri.jboss.org"); + SOAPElement soapElement = (SOAPElement)soapBody.getChildElements(name).next(); + StringBuffer builder = new StringBuffer(); NodeList nlist = soapElement.getChildNodes(); for (int i = 0; i < nlist.getLength(); i++) Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -22,12 +22,14 @@ package org.jboss.test.ws.jaxws.handlerlifecycle; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; +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; @@ -186,8 +188,32 @@ String testMethod; try { - SOAPElement soapElement = (SOAPElement)((SOAPMessageContext)msgContext).getMessage().getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); + + SOAPMessage message = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = null; + Iterator it = message.getSOAPBody().getChildElements(); + + while (soapElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapElement = (SOAPElement)current; + } + } + + it = soapElement.getChildElements(); + soapElement = null; + + while (soapElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapElement = (SOAPElement)current; + } + } + testMethod = soapElement.getValue(); } catch (SOAPException e) Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-17 07:47:21 UTC (rev 3117) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-17 10:57:34 UTC (rev 3118) @@ -31,6 +31,7 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; +import javax.xml.soap.Name; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPEnvelope; @@ -45,6 +46,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.w3c.dom.Element; @@ -131,7 +133,9 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope(); - Element child = (Element)resEnv.getBody().getChildElements().next(); + Name name = new NameImpl("user", "ns1", "http://org.jboss.ws/provider"); + Element child = (Element)resEnv.getBody().getChildElements(name).next(); + JAXBContext jc = JAXBContext.newInstance(new Class[]{UserType.class}); UserType user = (UserType)jc.createUnmarshaller().unmarshal(new DOMSource(child)); Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647 (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647) Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit) Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF) Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,56 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_RequestStruct</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessage</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>string_1</java-variable-name> - <xml-element-name>String_1</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_ResponseStruct</java-type> - <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessageResponse</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>result</java-variable-name> - <xml-element-name>result</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoMessage</java-method-name> - <wsdl-operation>echoMessage</wsdl-operation> - <wrapped-element/> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,56 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_RequestStruct</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessage</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>string_1</java-variable-name> + <xml-element-name>String_1</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_ResponseStruct</java-type> + <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessageResponse</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>result</java-variable-name> + <xml-element-name>result</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoMessage</java-method-name> + <wsdl-operation>echoMessage</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,21 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - - <handler> - <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class> - </handler> - - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,21 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + + <handler> + <handler-name>TestHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class> + </handler> + + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl) Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1647/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://org.jboss.test.ws/jbws1647/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1647/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - <complexType name='echoMessage'> - <sequence> - <element name='String_1' nillable='true' type='string'/> - </sequence> - </complexType> - <complexType name='echoMessageResponse'> - <sequence> - <element name='result' nillable='true' type='string'/> - </sequence> - </complexType> - <element name='echoMessage' type='tns:echoMessage'/> - <element name='echoMessageResponse' type='tns:echoMessageResponse'/> - </schema> - </types> - <message name='TestEndpoint_echoMessage' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part element='ns1:echoMessage' name='echoMessage'/> - </message> - <message name='TestEndpoint_echoMessageResponse'> - <part element='ns1:echoMessageResponse' name='echoMessageResponse'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoMessage' parameterOrder='echoMessage'> - <input message='tns:TestEndpoint_echoMessage'/> - <output message='tns:TestEndpoint_echoMessageResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoMessage'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1647/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://org.jboss.test.ws/jbws1647/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1647/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <complexType name='echoMessage'> + <sequence> + <element name='String_1' nillable='true' type='string'/> + </sequence> + </complexType> + <complexType name='echoMessageResponse'> + <sequence> + <element name='result' nillable='true' type='string'/> + </sequence> + </complexType> + <element name='echoMessage' type='tns:echoMessage'/> + <element name='echoMessageResponse' type='tns:echoMessageResponse'/> + </schema> + </types> + <message name='TestEndpoint_echoMessage' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part element='ns1:echoMessage' name='echoMessage'/> + </message> + <message name='TestEndpoint_echoMessageResponse'> + <part element='ns1:echoMessageResponse' name='echoMessageResponse'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoMessage' parameterOrder='echoMessage'> + <input message='tns:TestEndpoint_echoMessage'/> + <output message='tns:TestEndpoint_echoMessageResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoMessage'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="document"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="document"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration> Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit) Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF) Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> - <port-mapping> - <port-name>TestEndpointPort</port-name> - <java-port-name>TestEndpointPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoMessage</java-method-name> - <wsdl-operation>echoMessage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,37 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoMessage</java-method-name> + <wsdl-operation>echoMessage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,21 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - - <handler> - <handler-name>TestHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class> - </handler> - - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,21 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + + <handler> + <handler-name>TestHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class> + </handler> + + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl) Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoMessage'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoMessageResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoMessage' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoMessage'/> - <output message='tns:TestEndpoint_echoMessageResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoMessage'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_echoMessage'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoMessageResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='echoMessage' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echoMessage'/> + <output message='tns:TestEndpoint_echoMessageResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoMessage'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-05-15 12:42:40 UTC (rev 3098) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> - -</configuration> Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml (from rev 3098, branches/dlofthouse/JBWS-1647/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-05-17 10:57:34 UTC (rev 3118) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/> + <mapping file="jaxrpc-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> + +</configuration>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3117 - in branches/JBWS-856: jbossws-tests and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-05-17 03:47:21 -0400 (Thu, 17 May 2007) New Revision: 3117 Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml branches/JBWS-856/jbossws-tests/build.xml Log: Fixed resorce reading by tool Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-16 23:32:57 UTC (rev 3116) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-17 07:47:21 UTC (rev 3117) @@ -136,18 +136,19 @@ if (generateWsdl || !toolMode) processOrGenerateWSDL(seiClass, serviceMetaData, result.wsdlLocation, sepMetaData, result.policyLocation); - // No need to process endpoint items if we are in tool mode - if (toolMode) - return sepMetaData; - - //Process an optional @PolicyAttachment annotation - //TODO!! Move this before toolMode return after pacthing error with policy annotation resource reading +// Process an optional @PolicyAttachment annotation if (sepClass.isAnnotationPresent(PolicyAttachment.class)) { PolicyMetaDataBuilder policyBuilder = PolicyMetaDataBuilder.getServerSidePolicyMetaDataBuilder(toolMode); policyBuilder.processPolicyAnnotations(sepMetaData, sepClass, udi); } + + // No need to process endpoint items if we are in tool mode + if (toolMode) + return sepMetaData; + + // Sanity check: read the generated WSDL and initialize the schema model // Note, this should no longer be needed, look into removing it WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); Modified: branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-16 23:32:57 UTC (rev 3116) +++ branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-17 07:47:21 UTC (rev 3117) @@ -469,8 +469,8 @@ <include name="wsse.truststore"/> </webinf> <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF"> - <include name="PolicyAttachmentFragment.wsdl"/> - </webinf> + <include name="PolicyAttachmentFragment.wsdl"/> + </webinf> </war>  <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml"> Modified: branches/JBWS-856/jbossws-tests/build.xml =================================================================== --- branches/JBWS-856/jbossws-tests/build.xml 2007-05-16 23:32:57 UTC (rev 3116) +++ branches/JBWS-856/jbossws-tests/build.xml 2007-05-17 07:47:21 UTC (rev 3117) @@ -355,6 +355,7 @@ <classpath location="${thirdparty.dir}/commons-logging.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy"/> + <classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/> </taskdef> <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3116 - in branches/tdiesler/trunk: integration/spi/src/main/java/org/jboss/ws/integration and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-16 19:32:57 -0400 (Wed, 16 May 2007) New Revision: 3116 Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicEndpointInvocation.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/EndpointInvocation.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java Removed: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocation.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/Invocation.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/EndpointInvocation.java Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB21.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB3.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInterceptor.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicEndpoint.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicService.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Endpoint.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/LifecycleHandler.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/RequestHandler.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Service.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/AbstractDeployer.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeployerManager.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeployment.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentContext.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/Deployer.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/DeployerManager.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/Deployment.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/EndpointRegistryDeployer.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/WSDeploymentException.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocationContext.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationContext.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandler.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/EndpointRegistryFactory.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonBinding.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonClient.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java Log: restructure Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB21.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB21.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -35,7 +35,7 @@ import org.jboss.ejb.EjbModule; import org.jboss.ejb.Interceptor; import org.jboss.ejb.StatelessSessionContainer; -import org.jboss.ejb.plugins.AbstractInterceptor; +import org.jboss.invocation.Invocation; import org.jboss.invocation.InvocationKey; import org.jboss.invocation.InvocationType; import org.jboss.invocation.PayloadKey; @@ -45,7 +45,7 @@ import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; import org.jboss.ws.integration.invocation.HandlerCallback; -import org.jboss.ws.integration.invocation.Invocation; +import org.jboss.ws.integration.invocation.EndpointInvocation; import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.utils.ObjectNameFactory; @@ -105,10 +105,7 @@ if (next.getNext() == null) { log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName()); - AbstractInterceptor sepInterceptor = ep.getAttachment(AbstractInterceptor.class); - if (sepInterceptor == null) - throw new IllegalStateException("Cannot obtain endpoint interceptor"); - + ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor(); prev.setNext(sepInterceptor); sepInterceptor.setNext(next); injectionPointFound = true; @@ -125,7 +122,7 @@ } - public void invoke(Endpoint ep, Invocation epInv) throws Exception + public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception { log.debug("Invoke: " + epInv.getJavaMethod().getName()); @@ -139,26 +136,26 @@ // setup the invocation Method method = epInv.getJavaMethod(); Object[] args = epInv.getArgs(); - org.jboss.invocation.Invocation inv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential); + Invocation inv = new Invocation(null, method, args, null, principal, credential); // EJB2.1 endpoints will only get an JAXRPC context MessageContext msgContext = epInv.getInvocationContext().getAttachment(MessageContext.class); if (msgContext == null) throw new IllegalStateException("Cannot obtain MessageContext"); - + HandlerCallback callback = epInv.getInvocationContext().getAttachment(HandlerCallback.class); if (callback == null) throw new IllegalStateException("Cannot obtain HandlerCallback"); - + inv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext); inv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage()); inv.setType(InvocationType.SERVICE_ENDPOINT); inv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT); - inv.setValue(Invocation.class.getName(), epInv, PayloadKey.TRANSIENT); + inv.setValue(EndpointInvocation.class.getName(), epInv, PayloadKey.TRANSIENT); - String[] sig = { Invocation.class.getName() }; + String[] sig = { org.jboss.invocation.Invocation.class.getName() }; Object retObj = server.invoke(objectName, "invoke", new Object[] { inv }, sig); - epInv.setReturn(retObj); + epInv.setReturnValue(retObj); } catch (Exception e) { Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB3.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerEJB3.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -39,7 +39,7 @@ import org.jboss.injection.lang.reflect.BeanProperty; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.integration.invocation.Invocation; +import org.jboss.ws.integration.invocation.EndpointInvocation; import org.jboss.ws.integration.invocation.WebServiceContextEJB; import org.jboss.ws.utils.ObjectNameFactory; @@ -80,7 +80,7 @@ throw new WebServiceException("Cannot find service endpoint target: " + objectName); } - public void invoke(Endpoint ep, Invocation epInv) throws Exception + public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception { try { @@ -99,7 +99,7 @@ Object retObj = ejb3Inv.invokeNext(); - epInv.setReturn(retObj); + epInv.setReturnValue(retObj); } catch (Throwable th) { @@ -112,7 +112,7 @@ private javax.xml.ws.handler.MessageContext jaxwsMessageContext; private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext; - public CallbackImpl(Invocation epInv) + public CallbackImpl(EndpointInvocation epInv) { jaxrpcMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class); jaxwsMessageContext = epInv.getInvocationContext().getAttachment(javax.xml.ws.handler.MessageContext.class); Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/InvocationHandlerJSE.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -31,7 +31,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.invocation.Invocation; +import org.jboss.ws.integration.invocation.EndpointInvocation; import org.jboss.ws.integration.invocation.InvocationContext; import org.jboss.ws.integration.invocation.WebServiceContextInjector; @@ -58,7 +58,7 @@ } } - public void invoke(Endpoint ep, Invocation epInv) throws Exception + public void invoke(Endpoint ep, EndpointInvocation epInv) throws Exception { try { @@ -82,7 +82,7 @@ { Method method = getImplMethod(ep.getTargetBean(), epInv.getJavaMethod()); Object retObj = method.invoke(targetBean, epInv.getArgs()); - epInv.setReturn(retObj); + epInv.setReturnValue(retObj); } finally { Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInterceptor.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInterceptor.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInterceptor.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -60,8 +60,8 @@ } // Get the endpoint invocation - org.jboss.ws.integration.invocation.Invocation epInv = (org.jboss.ws.integration.invocation.Invocation)mi - .getValue(org.jboss.ws.integration.invocation.Invocation.class.getName()); + org.jboss.ws.integration.invocation.EndpointInvocation epInv = (org.jboss.ws.integration.invocation.EndpointInvocation)mi + .getValue(org.jboss.ws.integration.invocation.EndpointInvocation.class.getName()); // Get the handler callback HandlerCallback callback = (HandlerCallback)mi.getValue(HandlerCallback.class.getName()); @@ -87,7 +87,7 @@ // Setting the message to null should trigger binding of the response message msgContext.setMessage(null); - epInv.setReturn(resObj); + epInv.setReturnValue(resObj); } // call the response handlers @@ -95,7 +95,7 @@ handlersPass = handlersPass && callback.callResponseHandlerChain(HandlerType.ENDPOINT); // update the return value after response handler processing - Object resObj = epInv.getReturn(); + Object resObj = epInv.getReturnValue(); return resObj; } Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicEndpoint.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicEndpoint.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicEndpoint.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicService.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicService.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/BasicService.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Endpoint.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Endpoint.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Endpoint.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/LifecycleHandler.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/LifecycleHandler.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/LifecycleHandler.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/RequestHandler.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/RequestHandler.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/RequestHandler.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Service.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Service.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/Service.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/AbstractDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/AbstractDeployer.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/AbstractDeployer.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeployerManager.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeployerManager.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeployerManager.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeployment.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeployment.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeployment.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentContext.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentContext.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/BasicDeploymentContext.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/Deployer.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/Deployer.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/Deployer.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/DeployerManager.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/DeployerManager.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/DeployerManager.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/Deployment.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/Deployment.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/Deployment.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/EndpointRegistryDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/EndpointRegistryDeployer.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/EndpointRegistryDeployer.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/WSDeploymentException.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/WSDeploymentException.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/WSDeploymentException.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.deployment; Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicEndpointInvocation.java (from rev 3115, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocation.java) =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicEndpointInvocation.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicEndpointInvocation.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.invocation; + +import java.lang.reflect.Method; + +//$Id$ + +/** + * A general endpoint invocation. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class BasicEndpointInvocation implements EndpointInvocation +{ + private InvocationContext invocationContext; + private Method javaMethod; + private Object[] args; + private Object returnValue; + + public InvocationContext getInvocationContext() + { + return invocationContext; + } + + public void setInvocationContext(InvocationContext invocationContext) + { + this.invocationContext = invocationContext; + } + + public Method getJavaMethod() + { + return javaMethod; + } + + public void setJavaMethod(Method javaMethod) + { + this.javaMethod = javaMethod; + } + + public Object[] getArgs() + { + return args; + } + + public void setArgs(Object[] args) + { + this.args = args; + } + + public Object getReturnValue() + { + return returnValue; + } + + public void setReturnValue(Object returnValue) + { + this.returnValue = returnValue; + } +} Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocation.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocation.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocation.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,114 +0,0 @@ -/* - * ==================================================================== - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - */ -package org.jboss.ws.integration.invocation; - -import java.lang.reflect.Method; - -//$Id$ - -/** - * A general endpoint invocation. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public class BasicInvocation implements Invocation -{ - private InvocationContext invocationContext; - private Method javaMethod; - private Object[] args; - private Object returnValue; - - public InvocationContext getInvocationContext() - { - return invocationContext; - } - - public void setInvocationContext(InvocationContext invocationContext) - { - this.invocationContext = invocationContext; - } - - public Method getJavaMethod() - { - return javaMethod; - } - - public void setJavaMethod(Method javaMethod) - { - this.javaMethod = javaMethod; - } - - public Object[] getArgs() - { - return args; - } - - public void setArgs(Object[] args) - { - this.args = args; - } - - public Object getReturn() - { - return returnValue; - } - - public void setReturn(Object returnValue) - { - this.returnValue = returnValue; - } -} Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocationContext.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocationContext.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/BasicInvocationContext.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.invocation; Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/EndpointInvocation.java (from rev 3115, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/Invocation.java) =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/EndpointInvocation.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/EndpointInvocation.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.invocation; + +import java.lang.reflect.Method; + +//$Id$ + +/** + * A general endpoint invocation. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface EndpointInvocation +{ + InvocationContext getInvocationContext(); + + void setInvocationContext(InvocationContext context); + + Method getJavaMethod(); + + void setJavaMethod(Method method); + + Object[] getArgs(); + + void setArgs(Object[] args); + + Object getReturnValue(); + + void setReturnValue(Object ret); +} Deleted: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/Invocation.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/Invocation.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/Invocation.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,85 +0,0 @@ -/* - * ==================================================================== - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - */ -package org.jboss.ws.integration.invocation; - -import java.lang.reflect.Method; - -//$Id$ - -/** - * A general endpoint invocation. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface Invocation -{ - InvocationContext getInvocationContext(); - - void setInvocationContext(InvocationContext context); - - Method getJavaMethod(); - - void setJavaMethod(Method method); - - Object[] getArgs(); - - void setArgs(Object[] args); - - Object getReturn(); - - void setReturn(Object ret); -} Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationContext.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationContext.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationContext.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.invocation; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandler.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandler.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/InvocationHandler.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.invocation; @@ -74,7 +40,7 @@ void start(Endpoint ep); /** Invoke the the service endpoint */ - void invoke(Endpoint ep, Invocation inv) throws Exception; + void invoke(Endpoint ep, EndpointInvocation inv) throws Exception; /** Stop the invocation handler */ void stop(Endpoint ep); Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.management; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.management; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/EndpointRegistryFactory.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/EndpointRegistryFactory.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/management/EndpointRegistryFactory.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,57 +1,23 @@ /* - * ==================================================================== + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. * - * The Apache Software License, Version 1.1 + * 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. * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. + * 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. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache(a)apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.ws.integration.management; Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonBinding.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonBinding.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonBinding.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -40,16 +40,16 @@ public interface CommonBinding { /** On the client side, generate the Object from IN parameters. */ - MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException; + MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException; /** On the server side, extract the IN parameters from the Object and populate an Invocation object */ - EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction reqMessage) throws BindingException; + ServiceEndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction reqMessage) throws BindingException; /** On the server side, generate the Object from OUT parameters in the Invocation object. */ - MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException; + MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv) throws BindingException; /** On the client side, extract the OUT parameters from the Object and return them to the client. */ - void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction resMessage, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException; + void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction resMessage, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException; /** bind an exception to a fault message */ MessageAbstraction bindFaultMessage(Exception ex); Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonClient.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonClient.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -81,7 +81,7 @@ // The current operation name protected QName operationName; // Output parameters - protected EndpointInvocation epInv; + protected ServiceEndpointInvocation epInv; // The binding provider protected CommonBindingProvider bindingProvider; // A Map<QName,UnboundHeader> of header entries @@ -264,7 +264,7 @@ binding.setHeaderSource(this); // Create the invocation and sync the input parameters - epInv = new EndpointInvocation(opMetaData); + epInv = new ServiceEndpointInvocation(opMetaData); epInv.initInputParams(inputParams); // Set the required outbound properties @@ -479,7 +479,7 @@ /** Synchronize the operation paramters with the call output parameters. */ - private Object syncOutputParams(Object[] inParams, EndpointInvocation epInv) throws SOAPException + private Object syncOutputParams(Object[] inParams, ServiceEndpointInvocation epInv) throws SOAPException { Object retValue = null; Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -134,7 +134,7 @@ protected abstract MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException; /** On the client side, generate the payload from IN parameters. */ - public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) + public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { if (log.isDebugEnabled()) @@ -255,7 +255,7 @@ public abstract void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage); /** On the server side, extract the IN parameters from the payload and populate an Invocation object */ - public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction payload) throws BindingException + public ServiceEndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction payload) throws BindingException { if (log.isDebugEnabled()) log.debug("unbindRequestMessage: " + opMetaData.getQName()); @@ -272,7 +272,7 @@ verifySOAPVersion(opMetaData, soapEnvelope); // Construct the endpoint invocation object - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext == null) @@ -368,7 +368,7 @@ } /** On the server side, generate the payload from OUT parameters. */ - public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException + public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv) throws BindingException { if (log.isDebugEnabled()) log.debug("bindResponseMessage: " + opMetaData.getQName()); @@ -497,7 +497,7 @@ } /** On the client side, extract the OUT parameters from the payload and return them to the client. */ - public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction payload, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) + public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction payload, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { if (log.isDebugEnabled()) Deleted: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/EndpointInvocation.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -1,397 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core; - -// $Id$ - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.activation.DataHandler; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.soap.AttachmentPart; -import javax.xml.soap.SOAPException; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxrpc.ParameterWrapping; -import org.jboss.ws.core.soap.SOAPContentElement; -import org.jboss.ws.core.utils.HolderUtils; -import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.WrappedParameter; -import org.w3c.dom.Element; - -/** A web service invocation. - * - * @author Thomas.Diesler(a)jboss.org - * @since 16-Oct-2004 - */ -public class EndpointInvocation -{ - // provide logging - private static final Logger log = Logger.getLogger(EndpointInvocation.class); - - // The operation meta data for this invocation - private OperationMetaData opMetaData; - // Map the named endpoint parameters - private Map<QName, Object> reqPayload = new LinkedHashMap<QName, Object>(); - // Map the named endpoint parameters - private Map<QName, Object> resPayload = new LinkedHashMap<QName, Object>(); - // The return value - private Object returnValue; - // Map of output parameters, key being the parameter index in the method signature - private Map<Integer, Object> outParameters = new HashMap<Integer, Object>(); - - public EndpointInvocation(OperationMetaData opMetaData) - { - this.opMetaData = opMetaData; - } - - public OperationMetaData getOperationMetaData() - { - return opMetaData; - } - - public Method getJavaMethod() - { - return opMetaData.getJavaMethod(); - } - - public Map<Integer, Object> getOutParameters() - { - return outParameters; - } - - public List<QName> getRequestParamNames() - { - List<QName> xmlNames = new ArrayList<QName>(); - xmlNames.addAll(reqPayload.keySet()); - return xmlNames; - } - - public void setRequestParamValue(QName xmlName, Object value) - { - if (log.isDebugEnabled()) - log.debug("setRequestParamValue: [name=" + xmlName + ",value=" + getTypeName(value) + "]"); - reqPayload.put(xmlName, value); - } - - public Object getRequestParamValue(QName xmlName) - { - if (log.isDebugEnabled()) - log.debug("getRequestParamValue: " + xmlName); - Object paramValue = reqPayload.get(xmlName); - ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); - try - { - paramValue = transformPayloadValue(paramMetaData, paramValue); - } - catch (SOAPException ex) - { - throw new WSException(ex); - } - return paramValue; - } - - /** Returns the payload that can be passed on to the endpoint implementation - */ - public Object[] getRequestPayload() - { - log.debug("getRequestPayload"); - List<QName> xmlNames = getRequestParamNames(); - - Object[] payload = new Object[opMetaData.getJavaMethod().getParameterTypes().length]; - for (int i = 0; i < xmlNames.size(); i++) - { - QName xmlName = xmlNames.get(i); - Object paramValue = getRequestParamValue(xmlName); - - ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); - syncEndpointInputParam(paramMetaData, paramValue, payload); - } - - return payload; - } - - public List<QName> getResponseParamNames() - { - List<QName> xmlNames = new ArrayList<QName>(); - xmlNames.addAll(resPayload.keySet()); - return xmlNames; - } - - public void setResponseParamValue(QName xmlName, Object value) - { - if (log.isDebugEnabled()) - log.debug("setResponseParamValue: [name=" + xmlName + ",value=" + getTypeName(value) + "]"); - resPayload.put(xmlName, value); - } - - public Object getResponseParamValue(QName xmlName) throws SOAPException - { - if (log.isDebugEnabled()) - log.debug("getResponseParamValue: " + xmlName); - Object paramValue = resPayload.get(xmlName); - ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); - paramValue = transformPayloadValue(paramMetaData, paramValue); - if (paramValue != null) - { - Class valueType = paramValue.getClass(); - if (HolderUtils.isHolderType(valueType)) - { - paramValue = HolderUtils.getHolderValue(paramValue); - } - } - return paramValue; - } - - public void setReturnValue(Object value) - { - ParameterMetaData retMetaData = opMetaData.getReturnParameter(); - if (value != null && retMetaData == null) - throw new WSException("Operation does not have a return value: " + opMetaData.getQName()); - - if (log.isDebugEnabled()) - log.debug("setReturnValue: " + getTypeName(value)); - this.returnValue = value; - } - - public Object getReturnValue() - { - if (log.isDebugEnabled()) - log.debug("getReturnValue"); - Object paramValue = returnValue; - ParameterMetaData paramMetaData = opMetaData.getReturnParameter(); - if (paramMetaData != null) - { - try - { - paramValue = transformPayloadValue(paramMetaData, paramValue); - } - catch (SOAPException ex) - { - throw new WSException(ex); - } - } - return paramValue; - } - - private Object transformPayloadValue(ParameterMetaData paramMetaData, final Object paramValue) throws SOAPException - { - QName xmlName = paramMetaData.getXmlName(); - QName xmlType = paramMetaData.getXmlType(); - Class<?> javaType = paramMetaData.getJavaType(); - String javaName = paramMetaData.getJavaTypeName(); - - if (xmlType == null) - throw new IllegalStateException("Cannot obtain xml type for: [xmlName=" + xmlName + ",javaName=" + javaName + "]"); - - Object retValue = paramValue; - - // Handle attachment part - if (paramValue instanceof AttachmentPart) - { - AttachmentPart part = (AttachmentPart)paramValue; - - Set mimeTypes = paramMetaData.getMimeTypes(); - if (DataHandler.class.isAssignableFrom(javaType) && !javaType.equals(Object.class)) - { - DataHandler handler = part.getDataHandler(); - String mimeType = MimeUtils.getBaseMimeType(handler.getContentType()); - - // JAX-WS 2.0, 2.6.3.1 MIME Content - // Conformance (MIME type mismatch): On receipt of a message where the MIME type of a part does not - // match that described in the WSDL an implementation SHOULD throw a WebServiceException. - if (mimeTypes != null && !MimeUtils.isMemberOf(mimeType, mimeTypes)) - log.warn("Mime type " + mimeType + " not allowed for parameter " + xmlName + " allowed types are " + mimeTypes); - - retValue = part.getDataHandler(); - } - else - { - retValue = part.getContent(); - String mimeType = MimeUtils.getBaseMimeType(part.getContentType()); - - if (mimeTypes != null && !MimeUtils.isMemberOf(mimeType, mimeTypes)) - throw new SOAPException("Mime type " + mimeType + " not allowed for parameter " + xmlName + " allowed types are " + mimeTypes); - - if (retValue != null) - { - Class valueType = retValue.getClass(); - if (JavaUtils.isAssignableFrom(javaType, valueType) == false) - throw new SOAPException("javaType [" + javaType.getName() + "] is not assignable from attachment content: " + valueType.getName()); - } - } - } - else if (paramValue instanceof SOAPContentElement) - { - // If this is bound to a SOAPElement, or Element, then we can return - // the content element as is. - // Note, that it is possible for a Java type to be bound to an any - // type, so checking the xml type is not sufficient. - if (!Element.class.isAssignableFrom(javaType)) - { - SOAPContentElement soapElement = (SOAPContentElement)paramValue; - retValue = soapElement.getObjectValue(); - } - } - - if (log.isDebugEnabled()) - log.debug("transformPayloadValue: " + getTypeName(paramValue) + " -> " + getTypeName(retValue)); - return retValue; - } - - /** Synchronize the operation IN, INOUT paramters with the call input parameters. - * Essetially it unwrapps holders and converts primitives to wrapper types. - */ - public void initInputParams(Object[] inputParams) - { - for (ParameterMetaData paramMetaData : opMetaData.getParameters()) - { - int index = paramMetaData.getIndex(); - - // doc/lit wrapped return headers are OUT, so skip - if (index < 0) - continue; - - QName xmlName = paramMetaData.getXmlName(); - Class javaType = paramMetaData.getJavaType(); - - Object value; - if (opMetaData.isDocumentWrapped() && !paramMetaData.isInHeader() && !paramMetaData.isSwA()) - { - value = ParameterWrapping.wrapRequestParameters(paramMetaData, inputParams); - } - else - { - value = inputParams[index]; - if (value != null) - { - Class inputType = value.getClass(); - - if (HolderUtils.isHolderType(inputType)) - { - // At runtime we lose the generic info for JAX-WS types, - // So we use the actual instance type - value = HolderUtils.getHolderValue(value); - inputType = (value == null) ? null : value.getClass(); - } - - // Verify that the java type matches a registered xmlType - // Attachments are skipped because they don't use type mapping - if (value != null && !paramMetaData.isSwA() && !paramMetaData.isXOP()) - { - if (JavaUtils.isAssignableFrom(javaType, inputType) == false) - throw new WSException("Parameter '" + javaType + "' not assignable from: " + inputType); - } - } - } - - setRequestParamValue(xmlName, value); - } - } - - /** - * Synchronize the operation paramters with the endpoint method parameters - */ - private void syncEndpointInputParam(ParameterMetaData paramMetaData, final Object paramValue, Object[] payload) - { - Object retValue = paramValue; - Method method = opMetaData.getJavaMethod(); - Class[] targetParameterTypes = method.getParameterTypes(); - - if (opMetaData.isDocumentWrapped() && !paramMetaData.isInHeader() && !paramMetaData.isSwA() && !paramMetaData.isMessageType()) - { - outParameters = ParameterWrapping.unwrapRequestParameters(paramMetaData, paramValue, payload); - syncOutWrappedParameters(targetParameterTypes, payload); - } - else - { - // Replace INOUT and OUT parameters by their respective holder values - int index = paramMetaData.getIndex(); - Class targetParameterType = targetParameterTypes[index]; - - if (paramMetaData.getMode() == ParameterMode.INOUT || paramMetaData.getMode() == ParameterMode.OUT) - { - retValue = HolderUtils.createHolderInstance(paramValue, targetParameterType); - - QName xmlName = paramMetaData.getXmlName(); - setResponseParamValue(xmlName, retValue); - } - - if (retValue != null) - { - Class valueType = retValue.getClass(); - if (JavaUtils.isAssignableFrom(targetParameterType, valueType) == false) - throw new WSException("Parameter " + targetParameterType.getName() + " is not assignable from: " + getTypeName(retValue)); - - if (valueType.isArray()) - retValue = JavaUtils.syncArray(retValue, targetParameterType); - } - - if (log.isDebugEnabled()) - log.debug("syncEndpointInputParam: " + getTypeName(paramValue) + " -> " + getTypeName(retValue) + "(" + index + ")"); - payload[index] = retValue; - } - } - - private void syncOutWrappedParameters(Class[] targetParameterTypes, Object[] payload) - { - ParameterMetaData returnMetaData = opMetaData.getReturnParameter(); - if (returnMetaData != null) - { - for (WrappedParameter param : returnMetaData.getWrappedParameters()) - { - try - { - // only OUT parameters need to be initialized - if (param.getIndex() >= 0 && !outParameters.containsKey(param.getIndex())) - { - Object holder = targetParameterTypes[param.getIndex()].newInstance(); - payload[param.getIndex()] = holder; - outParameters.put(param.getIndex(), holder); - } - } - catch (Exception e) - { - throw new WSException("Could not add output param: " + param.getName(), e); - - } - } - } - } - - private String getTypeName(Object value) - { - String valueType = (value != null ? value.getClass().getName() : null); - return valueType; - } -} \ No newline at end of file Added: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java (rev 0) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -0,0 +1,397 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core; + +// $Id$ + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.activation.DataHandler; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.soap.AttachmentPart; +import javax.xml.soap.SOAPException; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.jaxrpc.ParameterWrapping; +import org.jboss.ws.core.soap.SOAPContentElement; +import org.jboss.ws.core.utils.HolderUtils; +import org.jboss.ws.core.utils.JavaUtils; +import org.jboss.ws.core.utils.MimeUtils; +import org.jboss.ws.metadata.umdm.OperationMetaData; +import org.jboss.ws.metadata.umdm.ParameterMetaData; +import org.jboss.ws.metadata.umdm.WrappedParameter; +import org.w3c.dom.Element; + +/** A web service invocation. + * + * @author Thomas.Diesler(a)jboss.org + * @since 16-Oct-2004 + */ +public class ServiceEndpointInvocation +{ + // provide logging + private static final Logger log = Logger.getLogger(ServiceEndpointInvocation.class); + + // The operation meta data for this invocation + private OperationMetaData opMetaData; + // Map the named endpoint parameters + private Map<QName, Object> reqPayload = new LinkedHashMap<QName, Object>(); + // Map the named endpoint parameters + private Map<QName, Object> resPayload = new LinkedHashMap<QName, Object>(); + // The return value + private Object returnValue; + // Map of output parameters, key being the parameter index in the method signature + private Map<Integer, Object> outParameters = new HashMap<Integer, Object>(); + + public ServiceEndpointInvocation(OperationMetaData opMetaData) + { + this.opMetaData = opMetaData; + } + + public OperationMetaData getOperationMetaData() + { + return opMetaData; + } + + public Method getJavaMethod() + { + return opMetaData.getJavaMethod(); + } + + public Map<Integer, Object> getOutParameters() + { + return outParameters; + } + + public List<QName> getRequestParamNames() + { + List<QName> xmlNames = new ArrayList<QName>(); + xmlNames.addAll(reqPayload.keySet()); + return xmlNames; + } + + public void setRequestParamValue(QName xmlName, Object value) + { + if (log.isDebugEnabled()) + log.debug("setRequestParamValue: [name=" + xmlName + ",value=" + getTypeName(value) + "]"); + reqPayload.put(xmlName, value); + } + + public Object getRequestParamValue(QName xmlName) + { + if (log.isDebugEnabled()) + log.debug("getRequestParamValue: " + xmlName); + Object paramValue = reqPayload.get(xmlName); + ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); + try + { + paramValue = transformPayloadValue(paramMetaData, paramValue); + } + catch (SOAPException ex) + { + throw new WSException(ex); + } + return paramValue; + } + + /** Returns the payload that can be passed on to the endpoint implementation + */ + public Object[] getRequestPayload() + { + log.debug("getRequestPayload"); + List<QName> xmlNames = getRequestParamNames(); + + Object[] payload = new Object[opMetaData.getJavaMethod().getParameterTypes().length]; + for (int i = 0; i < xmlNames.size(); i++) + { + QName xmlName = xmlNames.get(i); + Object paramValue = getRequestParamValue(xmlName); + + ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); + syncEndpointInputParam(paramMetaData, paramValue, payload); + } + + return payload; + } + + public List<QName> getResponseParamNames() + { + List<QName> xmlNames = new ArrayList<QName>(); + xmlNames.addAll(resPayload.keySet()); + return xmlNames; + } + + public void setResponseParamValue(QName xmlName, Object value) + { + if (log.isDebugEnabled()) + log.debug("setResponseParamValue: [name=" + xmlName + ",value=" + getTypeName(value) + "]"); + resPayload.put(xmlName, value); + } + + public Object getResponseParamValue(QName xmlName) throws SOAPException + { + if (log.isDebugEnabled()) + log.debug("getResponseParamValue: " + xmlName); + Object paramValue = resPayload.get(xmlName); + ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); + paramValue = transformPayloadValue(paramMetaData, paramValue); + if (paramValue != null) + { + Class valueType = paramValue.getClass(); + if (HolderUtils.isHolderType(valueType)) + { + paramValue = HolderUtils.getHolderValue(paramValue); + } + } + return paramValue; + } + + public void setReturnValue(Object value) + { + ParameterMetaData retMetaData = opMetaData.getReturnParameter(); + if (value != null && retMetaData == null) + throw new WSException("Operation does not have a return value: " + opMetaData.getQName()); + + if (log.isDebugEnabled()) + log.debug("setReturnValue: " + getTypeName(value)); + this.returnValue = value; + } + + public Object getReturnValue() + { + if (log.isDebugEnabled()) + log.debug("getReturnValue"); + Object paramValue = returnValue; + ParameterMetaData paramMetaData = opMetaData.getReturnParameter(); + if (paramMetaData != null) + { + try + { + paramValue = transformPayloadValue(paramMetaData, paramValue); + } + catch (SOAPException ex) + { + throw new WSException(ex); + } + } + return paramValue; + } + + private Object transformPayloadValue(ParameterMetaData paramMetaData, final Object paramValue) throws SOAPException + { + QName xmlName = paramMetaData.getXmlName(); + QName xmlType = paramMetaData.getXmlType(); + Class<?> javaType = paramMetaData.getJavaType(); + String javaName = paramMetaData.getJavaTypeName(); + + if (xmlType == null) + throw new IllegalStateException("Cannot obtain xml type for: [xmlName=" + xmlName + ",javaName=" + javaName + "]"); + + Object retValue = paramValue; + + // Handle attachment part + if (paramValue instanceof AttachmentPart) + { + AttachmentPart part = (AttachmentPart)paramValue; + + Set mimeTypes = paramMetaData.getMimeTypes(); + if (DataHandler.class.isAssignableFrom(javaType) && !javaType.equals(Object.class)) + { + DataHandler handler = part.getDataHandler(); + String mimeType = MimeUtils.getBaseMimeType(handler.getContentType()); + + // JAX-WS 2.0, 2.6.3.1 MIME Content + // Conformance (MIME type mismatch): On receipt of a message where the MIME type of a part does not + // match that described in the WSDL an implementation SHOULD throw a WebServiceException. + if (mimeTypes != null && !MimeUtils.isMemberOf(mimeType, mimeTypes)) + log.warn("Mime type " + mimeType + " not allowed for parameter " + xmlName + " allowed types are " + mimeTypes); + + retValue = part.getDataHandler(); + } + else + { + retValue = part.getContent(); + String mimeType = MimeUtils.getBaseMimeType(part.getContentType()); + + if (mimeTypes != null && !MimeUtils.isMemberOf(mimeType, mimeTypes)) + throw new SOAPException("Mime type " + mimeType + " not allowed for parameter " + xmlName + " allowed types are " + mimeTypes); + + if (retValue != null) + { + Class valueType = retValue.getClass(); + if (JavaUtils.isAssignableFrom(javaType, valueType) == false) + throw new SOAPException("javaType [" + javaType.getName() + "] is not assignable from attachment content: " + valueType.getName()); + } + } + } + else if (paramValue instanceof SOAPContentElement) + { + // If this is bound to a SOAPElement, or Element, then we can return + // the content element as is. + // Note, that it is possible for a Java type to be bound to an any + // type, so checking the xml type is not sufficient. + if (!Element.class.isAssignableFrom(javaType)) + { + SOAPContentElement soapElement = (SOAPContentElement)paramValue; + retValue = soapElement.getObjectValue(); + } + } + + if (log.isDebugEnabled()) + log.debug("transformPayloadValue: " + getTypeName(paramValue) + " -> " + getTypeName(retValue)); + return retValue; + } + + /** Synchronize the operation IN, INOUT paramters with the call input parameters. + * Essetially it unwrapps holders and converts primitives to wrapper types. + */ + public void initInputParams(Object[] inputParams) + { + for (ParameterMetaData paramMetaData : opMetaData.getParameters()) + { + int index = paramMetaData.getIndex(); + + // doc/lit wrapped return headers are OUT, so skip + if (index < 0) + continue; + + QName xmlName = paramMetaData.getXmlName(); + Class javaType = paramMetaData.getJavaType(); + + Object value; + if (opMetaData.isDocumentWrapped() && !paramMetaData.isInHeader() && !paramMetaData.isSwA()) + { + value = ParameterWrapping.wrapRequestParameters(paramMetaData, inputParams); + } + else + { + value = inputParams[index]; + if (value != null) + { + Class inputType = value.getClass(); + + if (HolderUtils.isHolderType(inputType)) + { + // At runtime we lose the generic info for JAX-WS types, + // So we use the actual instance type + value = HolderUtils.getHolderValue(value); + inputType = (value == null) ? null : value.getClass(); + } + + // Verify that the java type matches a registered xmlType + // Attachments are skipped because they don't use type mapping + if (value != null && !paramMetaData.isSwA() && !paramMetaData.isXOP()) + { + if (JavaUtils.isAssignableFrom(javaType, inputType) == false) + throw new WSException("Parameter '" + javaType + "' not assignable from: " + inputType); + } + } + } + + setRequestParamValue(xmlName, value); + } + } + + /** + * Synchronize the operation paramters with the endpoint method parameters + */ + private void syncEndpointInputParam(ParameterMetaData paramMetaData, final Object paramValue, Object[] payload) + { + Object retValue = paramValue; + Method method = opMetaData.getJavaMethod(); + Class[] targetParameterTypes = method.getParameterTypes(); + + if (opMetaData.isDocumentWrapped() && !paramMetaData.isInHeader() && !paramMetaData.isSwA() && !paramMetaData.isMessageType()) + { + outParameters = ParameterWrapping.unwrapRequestParameters(paramMetaData, paramValue, payload); + syncOutWrappedParameters(targetParameterTypes, payload); + } + else + { + // Replace INOUT and OUT parameters by their respective holder values + int index = paramMetaData.getIndex(); + Class targetParameterType = targetParameterTypes[index]; + + if (paramMetaData.getMode() == ParameterMode.INOUT || paramMetaData.getMode() == ParameterMode.OUT) + { + retValue = HolderUtils.createHolderInstance(paramValue, targetParameterType); + + QName xmlName = paramMetaData.getXmlName(); + setResponseParamValue(xmlName, retValue); + } + + if (retValue != null) + { + Class valueType = retValue.getClass(); + if (JavaUtils.isAssignableFrom(targetParameterType, valueType) == false) + throw new WSException("Parameter " + targetParameterType.getName() + " is not assignable from: " + getTypeName(retValue)); + + if (valueType.isArray()) + retValue = JavaUtils.syncArray(retValue, targetParameterType); + } + + if (log.isDebugEnabled()) + log.debug("syncEndpointInputParam: " + getTypeName(paramValue) + " -> " + getTypeName(retValue) + "(" + index + ")"); + payload[index] = retValue; + } + } + + private void syncOutWrappedParameters(Class[] targetParameterTypes, Object[] payload) + { + ParameterMetaData returnMetaData = opMetaData.getReturnParameter(); + if (returnMetaData != null) + { + for (WrappedParameter param : returnMetaData.getWrappedParameters()) + { + try + { + // only OUT parameters need to be initialized + if (param.getIndex() >= 0 && !outParameters.containsKey(param.getIndex())) + { + Object holder = targetParameterTypes[param.getIndex()].newInstance(); + payload[param.getIndex()] = holder; + outParameters.put(param.getIndex(), holder); + } + } + catch (Exception e) + { + throw new WSException("Could not add output param: " + param.getName(), e); + + } + } + } + } + + private String getTypeName(Object value) + { + String valueType = (value != null ? value.getClass().getName() : null); + return valueType; + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/ServiceEndpointInvocation.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -36,7 +36,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.ServiceEndpointInvocation; import org.jboss.ws.core.HTTPMessageImpl; import org.jboss.ws.core.HeaderSource; import org.jboss.ws.core.MessageAbstraction; @@ -60,19 +60,19 @@ private BindingImpl delegate = new BindingImpl(); - public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) + public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { throw new NotImplementedException(); } - public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction reqMessage) throws BindingException + public ServiceEndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction reqMessage) throws BindingException { log.debug("unbindRequestMessage: " + opMetaData.getQName()); try { // Construct the endpoint invocation object - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext == null) @@ -95,7 +95,7 @@ } } - public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException + public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv) throws BindingException { log.debug("bindResponseMessage: " + opMetaData.getQName()); try @@ -118,7 +118,7 @@ } } - public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction resMessage, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) + public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction resMessage, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { throw new NotImplementedException(); Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -34,7 +34,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.ServiceEndpointInvocation; import org.jboss.ws.core.HeaderSource; import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.jaxrpc.binding.BindingException; @@ -61,19 +61,19 @@ private BindingImpl delegate = new BindingImpl(); /** On the client side, generate the payload from IN parameters. */ - public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException + public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { throw new NotImplementedException(); } /** On the server side, extract the IN parameters from the payload and populate an Invocation object */ - public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction reqMessage) throws BindingException + public ServiceEndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction reqMessage) throws BindingException { log.debug("unbindRequestMessage: " + opMetaData.getQName()); try { // Construct the endpoint invocation object - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); SOAPMessageContextJAXWS msgContext = (SOAPMessageContextJAXWS)MessageContextAssociation.peekMessageContext(); if (msgContext == null) @@ -93,7 +93,7 @@ } /** On the server side, generate the payload from OUT parameters. */ - public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException + public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv) throws BindingException { log.debug("bindResponseMessage: " + opMetaData.getQName()); try @@ -116,7 +116,7 @@ } /** On the client side, extract the OUT parameters from the payload and return them to the client. */ - public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction resMessage, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) + public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction resMessage, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { throw new NotImplementedException(); Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -37,7 +37,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.ServiceEndpointInvocation; import org.jboss.ws.core.HeaderSource; import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.jaxrpc.binding.BindingException; @@ -69,20 +69,20 @@ private BindingImpl delegate = new BindingImpl(); /** On the client side, generate the payload from IN parameters. */ - public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) + public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { throw new NotImplementedException(); } /** On the server side, extract the IN parameters from the payload and populate an Invocation object */ - public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction payload) throws BindingException + public ServiceEndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction payload) throws BindingException { log.debug("unbindRequestMessage: " + opMetaData.getQName()); try { // Construct the endpoint invocation object - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext == null) @@ -111,7 +111,7 @@ } /** On the server side, generate the payload from OUT parameters. */ - public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException + public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, ServiceEndpointInvocation epInv) throws BindingException { log.debug("bindResponseMessage: " + opMetaData.getQName()); @@ -146,7 +146,7 @@ } /** On the client side, extract the OUT parameters from the payload and return them to the client. */ - public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction resMessage, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) + public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction resMessage, ServiceEndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { throw new NotImplementedException(); Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -49,8 +49,8 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.CommonSOAPBinding; import org.jboss.ws.core.DirectionHolder; -import org.jboss.ws.core.EndpointInvocation; import org.jboss.ws.core.MessageAbstraction; +import org.jboss.ws.core.ServiceEndpointInvocation; import org.jboss.ws.core.DirectionHolder.Direction; import org.jboss.ws.core.jaxrpc.ServletEndpointContextImpl; import org.jboss.ws.core.jaxrpc.binding.BindingException; @@ -66,8 +66,8 @@ import org.jboss.ws.core.utils.JavaUtils; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.invocation.BasicInvocation; -import org.jboss.ws.integration.invocation.Invocation; +import org.jboss.ws.integration.invocation.BasicEndpointInvocation; +import org.jboss.ws.integration.invocation.EndpointInvocation; import org.jboss.ws.integration.invocation.InvocationContext; import org.jboss.ws.integration.invocation.InvocationHandler; import org.jboss.ws.integration.invocation.WebServiceContextJSE; @@ -151,7 +151,7 @@ try { boolean oneway = false; - EndpointInvocation epInv = null; + ServiceEndpointInvocation sepInv = null; OperationMetaData opMetaData = null; CommonBinding binding = bindingProvider.getCommonBinding(); binding.setHeaderSource(delegate); @@ -182,7 +182,7 @@ ((CommonSOAPBinding)binding).checkMustUnderstand(opMetaData); // Unbind the request message - epInv = binding.unbindRequestMessage(opMetaData, reqMessage); + sepInv = binding.unbindRequestMessage(opMetaData, reqMessage); } handlersPass = handlersPass && callRequestHandlerChain(sepMetaData, handlerType[1]); @@ -198,11 +198,11 @@ { log.debug("Handler modified payload, unbind message again"); reqMessage = msgContext.getMessageAbstraction(); - epInv = binding.unbindRequestMessage(opMetaData, reqMessage); + sepInv = binding.unbindRequestMessage(opMetaData, reqMessage); } // Invoke an instance of the SEI implementation bean - Invocation inv = setupInvocation(endpoint, epInv, invContext); + EndpointInvocation inv = setupInvocation(endpoint, sepInv, invContext); InvocationHandler invHandler = endpoint.getInvocationHandler(); invHandler.invoke(endpoint, inv); } @@ -221,7 +221,7 @@ XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); // Bind the response message - MessageAbstraction resMessage = binding.bindResponseMessage(opMetaData, epInv); + MessageAbstraction resMessage = binding.bindResponseMessage(opMetaData, sepInv); msgContext.setMessageAbstraction(resMessage); } else @@ -277,7 +277,7 @@ } } - protected Invocation setupInvocation(Endpoint ep, EndpointInvocation epInv, InvocationContext invContext) throws Exception + protected EndpointInvocation setupInvocation(Endpoint ep, ServiceEndpointInvocation sepInv, InvocationContext invContext) throws Exception { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext instanceof SOAPMessageContextJAXWS) @@ -295,17 +295,17 @@ invContext.addAttachment(ServletEndpointContext.class, servletEndpointContext); } - Invocation inv = new DelegatingInvocation(epInv); + EndpointInvocation inv = new DelegatingInvocation(sepInv); inv.setInvocationContext(invContext); - inv.setJavaMethod(getImplMethod(endpoint, epInv)); + inv.setJavaMethod(getImplMethod(endpoint, sepInv)); return inv; } - protected Method getImplMethod(Endpoint endpoint, EndpointInvocation epInv) throws ClassNotFoundException, NoSuchMethodException + protected Method getImplMethod(Endpoint endpoint, ServiceEndpointInvocation sepInv) throws ClassNotFoundException, NoSuchMethodException { Class implClass = endpoint.getTargetBean(); - Method seiMethod = epInv.getJavaMethod(); + Method seiMethod = sepInv.getJavaMethod(); String methodName = seiMethod.getName(); Class[] paramTypes = seiMethod.getParameterTypes(); @@ -424,19 +424,19 @@ return opMetaData; } - class DelegatingInvocation extends BasicInvocation + class DelegatingInvocation extends BasicEndpointInvocation { - private EndpointInvocation epInv; + private ServiceEndpointInvocation sepInv; - public DelegatingInvocation(EndpointInvocation epInv) + public DelegatingInvocation(ServiceEndpointInvocation sepInv) { - this.epInv = epInv; + this.sepInv = sepInv; } @Override - public void setReturn(Object value) + public void setReturnValue(Object value) { - epInv.setReturnValue(value); + sepInv.setReturnValue(value); SOAPMessageContext msgContext = (SOAPMessageContext)getInvocationContext().getAttachment(javax.xml.rpc.handler.MessageContext.class); if (msgContext != null && msgContext.getMessage() == null) @@ -444,10 +444,10 @@ try { // Bind the response message - OperationMetaData opMetaData = epInv.getOperationMetaData(); + OperationMetaData opMetaData = sepInv.getOperationMetaData(); CommonBindingProvider bindingProvider = new CommonBindingProvider(opMetaData.getEndpointMetaData()); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); - SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv); + SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, sepInv); msgContext.setMessage(resMessage); } catch (BindingException ex) @@ -460,13 +460,13 @@ @Override public Object[] getArgs() { - return epInv.getRequestPayload(); + return sepInv.getRequestPayload(); } @Override - public Object getReturn() + public Object getReturnValue() { - return epInv.getReturnValue(); + return sepInv.getReturnValue(); } @Override Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerEJB21.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -23,10 +23,10 @@ // $Id$ -import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.ServiceEndpointInvocation; import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.invocation.EndpointInvocation; import org.jboss.ws.integration.invocation.HandlerCallback; -import org.jboss.ws.integration.invocation.Invocation; import org.jboss.ws.integration.invocation.InvocationContext; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -40,10 +40,10 @@ public class ServiceEndpointInvokerEJB21 extends ServiceEndpointInvoker { @Override - protected Invocation setupInvocation(Endpoint ep, EndpointInvocation epInv, InvocationContext invContext) throws Exception + protected EndpointInvocation setupInvocation(Endpoint ep, ServiceEndpointInvocation epInv, InvocationContext invContext) throws Exception { - Invocation inv = super.setupInvocation(ep, epInv, invContext); - + EndpointInvocation inv = super.setupInvocation(ep, epInv, invContext); + // Attach the handler callback ServerEndpointMetaData sepMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); invContext.addAttachment(HandlerCallback.class, new HandlerCallbackImpl(sepMetaData)); Modified: branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -40,7 +40,7 @@ import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.ServiceEndpointInvocation; import org.jboss.ws.core.jaxrpc.client.CallImpl; import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; import org.jboss.ws.core.soap.MessageContextAssociation; @@ -176,7 +176,7 @@ CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); epInv.initInputParams(new Object[]{"Hello World!"}); SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, null); @@ -202,7 +202,7 @@ paramMetaData.setInHeader(true); paramMetaData.setIndex(1); - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); epInv.initInputParams(new Object[]{"Hello World!", "IN header message"}); SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, null); @@ -229,7 +229,7 @@ Map headers = new HashMap(); headers.put(xmlName, header); - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); epInv.initInputParams(new Object[]{"Hello World!"}); SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, headers); @@ -256,7 +256,7 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(reqMessage); - EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage); + ServiceEndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage); assertNotNull(epInv); Object[] args = epInv.getRequestPayload(); @@ -285,7 +285,7 @@ CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); - EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage); + ServiceEndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage); assertNotNull(epInv); Object[] args = epInv.getRequestPayload(); @@ -308,7 +308,7 @@ CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); - EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage); + ServiceEndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage); assertNotNull(epInv); Object[] args = epInv.getRequestPayload(); @@ -323,7 +323,7 @@ CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); epInv.setReturnValue("Hello World!"); SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv); @@ -350,7 +350,7 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(resMessage); - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); binding.unbindResponseMessage(opMetaData, resMessage, epInv, null); assertEquals("Hello World!", epInv.getReturnValue()); } @@ -378,7 +378,7 @@ paramMetaData.setIndex(1); opMetaData.addParameter(paramMetaData); - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); binding.unbindResponseMessage(opMetaData, resMessage, epInv, null); assertEquals("Hello World!", epInv.getReturnValue()); @@ -407,7 +407,7 @@ Map headers = new HashMap(); headers.put(xmlName, header); - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); binding.unbindResponseMessage(opMetaData, resMessage, epInv, headers); assertEquals("Hello World!", epInv.getReturnValue()); @@ -431,7 +431,7 @@ try { - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); binding.unbindResponseMessage(opMetaData, resMessage, epInv, null); fail("SOAPFaultException expected"); } Modified: branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2007-05-16 22:47:19 UTC (rev 3115) +++ branches/tdiesler/trunk/jbossws/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2007-05-16 23:32:57 UTC (rev 3116) @@ -44,7 +44,7 @@ import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.ServiceEndpointInvocation; import org.jboss.ws.core.jaxrpc.client.CallImpl; import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; import org.jboss.ws.core.soap.MessageContextAssociation; @@ -150,7 +150,7 @@ CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP11HTTP_BINDING, Type.JAXRPC); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); - EndpointInvocation epInv = new EndpointInvocation(opMetaData); + ServiceEndpointInvocation epInv = new ServiceEndpointInvocation(opMetaData); epInv.initInputParams(new Object[]{"Hello World!", "hi"}); SOAPMessage reqMessage = (SOAPMessage)binding.bindRequestMessage(opMetaData, epInv, null);

17 years, 1 month

1
0
0 / 0

← Newer
1
...
20
21
22
23
24
25
26
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007