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

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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Deployment JBoss42 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to jboss42 --> - <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> - - <!-- Remove jbossws from jboss42 --> - <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"/> <!-- The old 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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- Release to jboss.local.repository --> - <target name="release" depends="jars" - description="Release to jboss.local.repository"> - - <!-- jboss/jbossws-jboss42 --> - <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"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - -<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"/> - - <!-- - Init the various classpaths - --> - <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> - - <!-- The combined compile classpath --> - <path id="javac.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${jboss.client}/jboss-common-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> - </path> - - <!-- The test client classpath --> - <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> - - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <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> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> - </target> - - <target name="thirdparty-init" depends="prepare"/> - - <!-- - thirdpartry-get - --> - <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<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"/> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <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"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <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> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - - <!-- Compile integration java sources --> - <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> - - <!-- Compile etc files (manifests and such) --> - <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> - - <!-- ================================================================== --> - <!-- Archives --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> - </target> - - <!-- - | Build all jar files. - --> - <target name="module-jars" depends="init"> - - <!-- Build jbossws-jbws42.jar --> - <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> - - <!-- Build jbossws-context.war --> - <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> - - <!-- Build jbossws42.sar --> - <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> - - <!-- Build jbossws42-src.zip --> - <zip zipfile="${jbws42.output.lib.dir}/jbossws-jbws42-src.zip" > - <fileset dir="${jbws42.java.dir}"/> - </zip> - - </target> - - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <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=&quot;@repository.id(a)&quot; - 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"> - - <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.ManagedServerConfig"> - <!-- - The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> - element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. - - If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. - If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. - - If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>. - --> - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="modifySOAPAddress">true</property> - - <!-- - Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. - Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - --> - </bean> - - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/> - - <!-- A subscription manager for WS-Eventing --> - <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> - - <!-- Bind Service objects in client environment context --> - <!-- The bean name is compiled into the server. Changeit with the next release. --> - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> - - <!-- Locate the single instance of the kernel --> - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - - <!-- - ********************************************************************************************************************* - Web Service deployment - - There are three deployer interceptors registered with the JBoss Deployers. - - 1) DeployerInterceptorJSE - 2) DeployerInterceptorEJB21 - 3) DeployerInterceptorEJB3 - - Each interceptor has a number of DeployerHooks registerd with it - - Conceptually, each of these hooks implements the following pattern: - - DployerHook.deploy(unit) - if(isWebServiceDeployment) - Deployment dep = createDeployment(unit) - DeployerManager.deploy(dep) - - DeployerHook.undeploy(unit) - Deployment dep = getDeployment(unit) - DeployerManager.undeploy(dep) - - Each deployer hook has a web service DeployerManager injected into it. - A web service DeployerManager maintains a list of Deployers, each of which - handles a single aspect of web service deployment. - - Finally, each Endpoint is registered with the EndpointRegistry. - - ********************************************************************************************************************* - --> - - <!-- - Each DeploymentManger maintains a list of Deployers - Each Deployer handles a single aspect of web service deployment. - --> - <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> - - <!-- - The Deployers - Each handles a single aspect of web service deployment - --> - <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> - - <!-- Deployer helper beans --> - <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"/> - - <!-- - Register DeployerHooks with JBoss deployers - --> - <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"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Deployment JBoss42 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss42 --> + <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> + + <!-- Remove jbossws from jboss42 --> + <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"/> <!-- The old 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"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Deployment JBoss50 --> + <!-- ================================================================== --> + + <!-- Deploy jbossws to jboss50 --> + <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> + + <!-- Remove jbossws from jboss50 --> + <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"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- Release to jboss.local.repository --> + <target name="release" depends="jars" + description="Release to jboss.local.repository"> + + <!-- jboss/jbossws-jboss42 --> + <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"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- Release to jboss.local.repository --> + <target name="release" depends="jbws50-jars" + description="Release to jboss.local.repository"> + + <!-- jboss/jbossws-jboss50 --> + <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"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- Release to jboss.local.repository --> - <target name="release" depends="jbws50-jars" - description="Release to jboss.local.repository"> - - <!-- jboss/jbossws-jboss50 --> - <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"/> + + <!-- + Run tests against jboss50 + --> + <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> <!-- + Run tests against jboss42 + --> + <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> + + <!-- Init the various classpaths --> <target name="tests-init" depends="tests-prepare"> @@ -78,7 +93,7 @@ <!-- Copy resources --> <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 @@ <!-- $Id$ --> -<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"/> <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - <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"/> <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> <target name="init" depends="prepare,thirdparty"> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <!-- <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="main" inheritall="false"/> + --> </target> <!-- ================================================================== --> @@ -59,19 +62,13 @@ <!-- Compile java sources --> <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> <!-- Compile etc files (manifests and such) --> <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 @@ <!-- | Build all jar files. --> - <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> <!-- | Build all jar files. --> - <target name="module-jars" depends="init"> + <target name="jars-jbws50" depends="compile"> - <!-- Build jbossws-jbws50.jar --> - <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}"/> <!-- Build jbossws-context.war --> - <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> - <!-- Build jbossws50.sar --> - <jar jarfile="${jbws50.output.lib.dir}/jbossws-jbws50.sar" manifest="${jbws50.output.etc.dir}/default.mf"> + <!-- Build jbossws-jbws50.sar --> + <jar jarfile="${jbws.output.lib.dir}/jbossws-jbws50.sar" manifest="${jbws.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service - <fileset dir="${jbws50.output.lib.dir}"> + <fileset dir="${jbws.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> --> @@ -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> - <!-- Build jbossws50.deployer --> - <zip zipfile="${jbws50.output.lib.dir}/jbossws-jbws50-deployer.zip"> + <!-- Build jbossws-jbws50.deployer --> + <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> - <!-- Build jbossws50-src.zip --> - <zip zipfile="${jbws50.output.lib.dir}/jbossws-jbws50-src.zip" > - <fileset dir="${jbws50.java.dir}"/> - </zip> - </target> + <!-- + | Build all jar files. + --> + <target name="jars-jbws42" depends="compile"> + + <mkdir dir="${jbws.output.lib.dir}"/> + + <!-- Build jbossws-jbws42.sar --> + <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> + <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> <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=&quot;@repository.id(a)&quot; + 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=&quot;@repository.id(a)&quot; + 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=&quot;@repository.id(a)&quot; - 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"?> + +<!-- $Id$ --> + +<server> + + <!-- + A deployer service for JSE endpoints. + --> + <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> + + <!-- + A deployer service for EJB2.1 endpoints. + --> + <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> + + <!-- + A deployer service for EJB3 endpoints. + --> + <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"> + + <!-- An abstraction of server configuration aspects. --> + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.ManagedServerConfig"> + <!-- + The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> + element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. + + If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. + If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. + + If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>. + --> + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> + </bean> + + <!-- The registry for web service endpoints --> + <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/> + + <!-- A subscription manager for WS-Eventing --> + <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> + + <!-- Bind Service objects in client environment context --> + <!-- The bean name is compiled into the server. Changeit with the next release. --> + <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> + + <!-- Locate the single instance of the kernel --> + <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + + <!-- + ********************************************************************************************************************* + Web Service deployment + + There are three deployer interceptors registered with the JBoss Deployers. + + 1) DeployerInterceptorJSE + 2) DeployerInterceptorEJB21 + 3) DeployerInterceptorEJB3 + + Each interceptor has a number of DeployerHooks registerd with it + + Conceptually, each of these hooks implements the following pattern: + + DployerHook.deploy(unit) + if(isWebServiceDeployment) + Deployment dep = createDeployment(unit) + DeployerManager.deploy(dep) + + DeployerHook.undeploy(unit) + Deployment dep = getDeployment(unit) + DeployerManager.undeploy(dep) + + Each deployer hook has a web service DeployerManager injected into it. + A web service DeployerManager maintains a list of Deployers, each of which + handles a single aspect of web service deployment. + + Finally, each Endpoint is registered with the EndpointRegistry. + + ********************************************************************************************************************* + --> + + <!-- + Each DeploymentManger maintains a list of Deployers + Each Deployer handles a single aspect of web service deployment. + --> + <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> + + <!-- + The Deployers + Each handles a single aspect of web service deployment + --> + <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> + + <!-- Deployer helper beans --> + <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"/> + + <!-- + Register DeployerHooks with JBoss deployers + --> + <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"/> <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - <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"/>