[jbossws-commits] JBossWS SVN: r2914 - in trunk: integration-jboss50 and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-04-24 08:51:10 -0400 (Tue, 24 Apr 2007) New Revision: 2914 Added: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceAbstractDeployer.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployer.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceStartStopDeployer.java Modified: trunk/build/ant-import/build-thirdparty.xml trunk/integration-jboss50/build.xml trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerEJB.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml Log: Add a layer of indirection for the deployers Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-04-24 08:30:31 UTC (rev 2913) +++ trunk/build/ant-import/build-thirdparty.xml 2007-04-24 12:51:10 UTC (rev 2914) @@ -59,8 +59,10 @@ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-04-24 08:30:31 UTC (rev 2913) +++ trunk/integration-jboss50/build.xml 2007-04-24 12:51:10 UTC (rev 2914) @@ -98,6 +98,9 @@ <!-- Build jbossws50.sar --> <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${build.etc.dir}/default.mf"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> + </fileset> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> @@ -112,6 +115,9 @@ <include name="standard-jaxws-client-config.xml"/> <include name="standard-jaxws-endpoint-config.xml"/> </metainf> + <metainf dir="${jboss50.resources.dir}/jbossws.sar/META-INF"> + <include name="jbossws-beans.xml"/> + </metainf> </jar> <!-- Build jbossws50.deployer --> @@ -119,15 +125,6 @@ <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-jboss50-integration.jar"/> </fileset> - <fileset dir="${api.output.lib.dir}"> - <include name="jboss-jaxws.jar"/> - </fileset> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="wsdl4j.jar"/> - </fileset> <fileset dir="${jboss50.resources.dir}/jbossws.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2007-04-24 08:30:31 UTC (rev 2913) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -23,16 +23,16 @@ //$Id$ -import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer; import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ws.integration.KernelLocator; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.logging.Logger; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; import org.jboss.ws.core.server.ServiceEndpointDeployer; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.integration.KernelLocator; /** * An abstract web service deployer. @@ -50,8 +50,11 @@ * @author Thomas.Diesler(a)jboss.org * @since 31-Oct-2006 */ -public abstract class AbstractDeployer extends AbstractSimpleDeployer +public abstract class AbstractDeployer implements WebServiceDeployer { + // provide logging + private static final Logger log = Logger.getLogger(AbstractDeployer.class); + /** Depending on the type of deployment, this method should return true * if the deployment contains web service endpoints. */ @@ -59,7 +62,6 @@ /** Deploy the web service endpoints if there are any */ - @Override public final void deploy(DeploymentUnit unit) throws DeploymentException { boolean isComponent = unit.getDeploymentContext().isComponent(); @@ -82,14 +84,13 @@ UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(unit); if (udi != null) undeployInternal(unit, udi); - + DeploymentException.rethrowAsDeploymentException("Cannot create service endpoint", ex); } } /** Undeploy the web service endpoints if there are any */ - @Override public final void undeploy(DeploymentUnit unit) { boolean isComponent = unit.getDeploymentContext().isComponent(); Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerEJB.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerEJB.java 2007-04-24 08:30:31 UTC (rev 2913) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerEJB.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -27,6 +27,7 @@ import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.metadata.umdm.UnifiedMetaData; @@ -38,6 +39,9 @@ */ public abstract class AbstractDeployerEJB extends AbstractDeployer { + // provide logging + protected static final Logger log = Logger.getLogger(AbstractDeployerEJB.class); + @Override protected void createServiceEndpoint(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception { Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java 2007-04-24 08:30:31 UTC (rev 2913) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployerJSE.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -23,18 +23,16 @@ //$Id$ -import java.io.InputStream; -import java.net.URL; import java.util.Iterator; import java.util.Set; import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; import org.jboss.metadata.NameValuePair; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; -import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults; import org.jboss.ws.core.utils.JavaUtils; /** @@ -45,10 +43,12 @@ */ public abstract class AbstractDeployerJSE extends AbstractDeployer { + // provide logging + protected static final Logger log = Logger.getLogger(AbstractDeployerJSE.class); + public AbstractDeployerJSE() { super(); - super.setRelativeOrder(CLASSLOADER_DEPLOYER + 1); } /** Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2007-04-24 08:30:31 UTC (rev 2913) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -25,15 +25,15 @@ import java.util.Set; -import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer; import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ws.integration.KernelLocator; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.logging.Logger; import org.jboss.metadata.WebMetaData; import org.jboss.ws.core.server.ServiceEndpointDeployer; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.KernelLocator; /** * A deployer that starts and stops web service deployments @@ -41,11 +41,13 @@ * @author Thomas.Diesler(a)jboss.org * @since 31-Oct-2006 */ -public class ServiceEndpointLifecycleDeployer extends AbstractSimpleDeployer +public class ServiceEndpointLifecycleDeployer implements WebServiceDeployer { + // provide logging + private static final Logger log = Logger.getLogger(ServiceEndpointLifecycleDeployer.class); + /** Start the service endpoint */ - @Override public void deploy(DeploymentUnit unit) throws DeploymentException { UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class); @@ -66,7 +68,6 @@ /** Stop the service endpoint */ - @Override public void undeploy(DeploymentUnit unit) { UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class); Added: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceAbstractDeployer.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceAbstractDeployer.java (rev 0) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceAbstractDeployer.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50; + +//$Id$ + +import java.util.LinkedList; +import java.util.List; + +import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer; +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; + +/** + * This deployer delegates to registerd web service deployers + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public abstract class WebServiceAbstractDeployer extends AbstractSimpleDeployer +{ + // provide logging + private static final Logger log = Logger.getLogger(WebServiceAbstractDeployer.class); + + private List<WebServiceDeployer> deployers = new LinkedList<WebServiceDeployer>(); + + public void addDeployer(WebServiceDeployer deployer) + { + log.debug("Add deployer: " + deployer); + deployers.add(deployer); + } + + public void removeDeployer(WebServiceDeployer deployer) + { + log.debug("Remove deployer: " + deployer); + deployers.remove(deployer); + } + + @Override + public void deploy(DeploymentUnit unit) throws DeploymentException + { + log.debug("Deploy: " + unit.getName()); + for (WebServiceDeployer deployer : deployers) + deployer.deploy(unit); + } + + @Override + public void undeploy(DeploymentUnit unit) + { + log.debug("Undeploy: " + unit.getName()); + for (WebServiceDeployer deployer : deployers) + deployer.undeploy(unit); + } +} Property changes on: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceAbstractDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployer.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployer.java (rev 0) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployer.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50; + +//$Id$ + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; + +/** + * An interface for all web service deployers + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public interface WebServiceDeployer +{ + void deploy(DeploymentUnit unit) throws DeploymentException; + + public void undeploy(DeploymentUnit unit); +} Property changes on: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java (rev 0) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50; + +//$Id$ + +/** + * This deployer delegates to registerd web service deployers + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerEJB extends WebServiceAbstractDeployer +{ +} Property changes on: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java (rev 0) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50; + +//$Id$ + +/** + * This deployer delegates to registerd web service deployers + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerJSE extends WebServiceAbstractDeployer +{ +} Property changes on: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceStartStopDeployer.java =================================================================== --- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceStartStopDeployer.java (rev 0) +++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceStartStopDeployer.java 2007-04-24 12:51:10 UTC (rev 2914) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss50; + +//$Id$ + +/** + * This deployer delegates to registerd web service deployers + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceStartStopDeployer extends WebServiceAbstractDeployer +{ +} Property changes on: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceStartStopDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-04-24 08:30:31 UTC (rev 2913) +++ trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-04-24 12:51:10 UTC (rev 2914) @@ -2,60 +2,10 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> - <bean name="KernelLocator" class="org.jboss.ws.integration.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - - <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager"> - - <!-- - 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 'alwaysModifySOAPAddress' is true. - If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. - - If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>. - --> - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="alwaysModifySOAPAddress">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> - --> - - <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> - <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB3</property> - <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB21</property> - <!-- Not implemented - <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerMDB</property> - --> - </bean> - - <bean name="ServiceEndpointDeployer" class="org.jboss.ws.core.server.ServiceEndpointDeployer"> - <property name="serviceEndpointManager"> - <inject bean="ServiceEndpointManager"/> - </property> - </bean> - - <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss50.ServiceEndpointPublisher"> - <property name="mainDeployer"><inject bean="MainDeployer"/></property> - <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss50.JBossServiceEndpointServlet</property> - </bean> - - <!-- Bind Service objects in client environment context --> - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> - - <!-- A subscription manager for WS-Eventing --> - <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> - - <bean name="ServerConfig" class="org.jboss.ws.integration.jboss50.ServerConfigImpl"/> - - <bean name="JAXWSDeployerEJB3" class="org.jboss.ws.integration.jboss50.JAXWSDeployerEJB3"> + <!-- + A web service deployer that hooks in after the EJB deployer + --> + <bean name="WebServiceDeployerEJB" class="org.jboss.ws.integration.jboss50.WebServiceDeployerEJB"> <install bean="MainDeployer" method="addDeployer"> <parameter> <this/> @@ -67,11 +17,17 @@ </parameter> </uninstall> <depends>EJBRegistrationDeployer</depends> - <depends>JBossWebAppParsingDeployer</depends> - <depends>ServiceEndpointManager</depends> </bean> - <bean name="JAXWSDeployerJSE" class="org.jboss.ws.integration.jboss50.JAXWSDeployerJSE"> + <!-- + A web service deployer that hooks in before the WAR deployer + --> + <bean name="WebServiceDeployerJSE" class="org.jboss.ws.integration.jboss50.WebServiceDeployerJSE"> + <!-- + The AbstractWarDeployer sets this explicitly to 7001. We need to hook in before + Should this not be done with bean dependencies (i.e. the WarDeployer should depend on this guy)? + --> + <property name="relativeOrder">7000</property> <install bean="MainDeployer" method="addDeployer"> <parameter> <this/> @@ -82,11 +38,13 @@ <this/> </parameter> </uninstall> - <depends>JBossWebAppParsingDeployer</depends> - <depends>ServiceEndpointManager</depends> + <depends>WebAppParsingDeployer</depends> </bean> - <bean name="JAXRPCDeployerJSE" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerJSE"> + <!-- + A web service deployer that hooks in after the WAR/EJB deployer + --> + <bean name="WebServiceStartStopDeployer" class="org.jboss.ws.integration.jboss50.WebServiceStartStopDeployer"> <install bean="MainDeployer" method="addDeployer"> <parameter> <this/> @@ -97,37 +55,9 @@ <this/> </parameter> </uninstall> - <depends>JBossWebAppParsingDeployer</depends> - <depends>ServiceEndpointManager</depends> + <depends>WarDeployer</depends> + <depends>WebServiceDeployerEJB</depends> + <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="JAXRPCDeployerEJB21" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerEJB21"> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>JBossWebAppParsingDeployer</depends> - <depends>ServiceEndpointManager</depends> - </bean> - - <bean name="ServiceEndpointLifecycleDeployer" class="org.jboss.ws.integration.jboss50.ServiceEndpointLifecycleDeployer"> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>ServiceEndpointManager</depends> - </bean> - </deployment>