Author: alessio.soldano(a)jboss.com
Date: 2008-03-18 06:55:56 -0400 (Tue, 18 Mar 2008)
New Revision: 5994
Added:
stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml
Modified:
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/build.xml
stack/native/trunk/src/main/resources/jbossws-native-config.xml
Log:
[JBWS-1922] Moving AS42 container config to the stack code base
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-18 10:48:19 UTC (rev 5993)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-18 10:55:56 UTC (rev 5994)
@@ -63,7 +63,6 @@
<get
src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip"
dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar"
dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip"
dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip"
dest="${thirdparty.dir}/jbossws-jboss42-resources.zip"
usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar"
dest="${thirdparty.dir}/ant.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar"
dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true"
verbose="true"/>
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-03-18 10:48:19 UTC (rev 5993)
+++ stack/native/trunk/build.xml 2008-03-18 10:55:56 UTC (rev 5994)
@@ -195,13 +195,12 @@
</concat>
<!-- Concat jboss-beans.xml -->
- <unzip dest="${core.output.dir}/resources"
src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
<concat
destfile="${core.output.resources.dir}/jbossws-native42-beans.xml">
<header trimleading="yes">
<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">
</header>
<fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <fileset
file="${core.output.resources.dir}/jbossws-jboss42-config.xml"/>
+ <fileset file="${core.resources.dir}/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
Added: stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml
(rev 0)
+++ stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 10:55:56
UTC (rev 5994)
@@ -0,0 +1,294 @@
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator"
class="org.jboss.wsf.spi.util.KernelLocator">
+ <property name="kernel"><inject
bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!-- Locate the single instance of the MBeanServer -->
+ <bean name="WSMBeanServerLocator"
class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
+
+ <!-- The HTTPServer used by the JAXWS Endpoint API -->
+ <bean name="WSHTTPServer"
class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
+
+ <!-- Bind Service objects in client environment context -->
+ <bean name="WSServiceRefHandler"
class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
+
+ <!-- JBoss_4_2_0_GA uses this hardcoded bean name -->
+ <bean name="ServiceRefHandler"
class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
+
+ <!--
+
*********************************************************************************************************************
+ 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)
+ DeploymentAspectManager.deploy(dep)
+
+ DeployerHook.undeploy(unit)
+ Deployment dep = getDeployment(unit)
+ DeploymentAspectManager.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.
+
+
*********************************************************************************************************************
+ -->
+
+ <!--
+ Register DeployerHooks with JBoss deployers
+ -->
+
+ <!-- Phase 1 -->
+ <bean name="WSDeployerHook_JAXRPC_PRE_JSE"
class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE">
+ <property
name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList"
elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSDeployerHook_JAXRPC_POST_JSE"
class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE">
+ <property
name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
+ <property name="phaseTwoInterceptors">
+ <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.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
+ <property
name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList"
elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Phase 1 -->
+ <bean name="WSDeployerHook_JAXWS_PRE_JSE"
class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE">
+ <property
name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
+ <property name="phaseOneInterceptors">
+ <list class="java.util.LinkedList"
elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSDeployerHook_JAXWS_POST_JSE"
class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE">
+ <property
name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
+ <property name="phaseTwoInterceptors">
+ <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.wsf.container.jboss42.JAXWSDeployerHookEJB3">
+ <property
name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
+ <property name="phaseTwoInterceptors">
+ <list class="java.util.LinkedList"
elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB3</value>
+ </list>
+ </property>
+ </bean>
+
+ <!--
+ Each DeploymentAspectManger maintains a list of DeploymentAspects
+ -->
+ <bean name="WSDeploymentAspectManagerPreJSE"
class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property
name="name">WSDeploymentAspectManagerPreJSE</property>
+ </bean>
+ <bean name="WSDeploymentAspectManagerPostJSE"
class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="parent"><inject
bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property
name="name">WSDeploymentAspectManagerPostJSE</property>
+ </bean>
+ <bean name="WSDeploymentAspectManagerEJB"
class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerEJB</property>
+ </bean>
+ <bean name="WSDeploymentAspectManagerEndpointAPI"
class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property
name="name">WSDeploymentAspectManagerEndpointAPI</property>
+ </bean>
+
+ <!--
+ The container deployment aspects
+ -->
+ <bean name="WSContainerMetaDataDeploymentAspect"
class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect">
+ <property name="provides">ContainerMetaData,
VFSRoot</property>
+ <property name="metaDataAdapter"><inject
bean="WSContainerMetaDataAdapter"/></property>
+ </bean>
+
+ <bean name="WSContextRootDeploymentAspect"
class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContextRoot</property>
+ </bean>
+
+ <bean name="WSEndpointAPIDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
+ <property name="provides">ContainerMetaData, RuntimeLoader,
URLPattern, VFSRoot</property>
+ </bean>
+
+ <bean name="WSEndpointAddressDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointAddress</property>
+ </bean>
+
+ <bean name="WSEndpointHandlerDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContainerEndpointHandler</property>
+ </bean>
+
+ <bean name="WSEndpointLifecycleDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
+ </bean>
+
+ <bean name="WSEndpointMetricsDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
+ <property name="provides">EndpointMetrics</property>
+ </bean>
+
+ <bean name="WSEndpointNameDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointName</property>
+ </bean>
+
+ <bean name="WSEndpointRegistryDeploymentAspect"
class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
+ <property name="requires">EndpointName</property>
+ <property name="provides">RegisteredEndpoint</property>
+ <depends>WSEndpointRegistry</depends>
+ </bean>
+
+ <bean name="WSModifyWebMetaDataDeploymentAspect"
class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect">
+ <property name="requires">ContextProperties, ContainerMetaData,
StackDescriptor</property>
+ <property name="webXMLRewriter"><inject
bean="WSWebXMLRewriter"/></property>
+ </bean>
+
+ <bean name="WSRuntimeLoaderDeploymentAspect"
class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">RuntimeLoader</property>
+ </bean>
+
+ <bean name="WSURLPatternDeploymentAspect"
class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
+ <property name="requires">ContextRoot,
ContainerMetaData</property>
+ <property name="provides">URLPattern</property>
+ </bean>
+
+ <bean name="WSWebAppDeploymentAspect"
class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect">
+ <property name="requires">WebMetaData,
ContextProperties</property>
+ <property name="webXMLRewriter"><inject
bean="WSWebXMLRewriter"/></property>
+ </bean>
+
+ <bean name="WSWebAppGeneratorDeploymentAspect"
class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">WebMetaData</property>
+ <property name="securityHandlerEJB21"><inject
bean="WSSecurityHandlerEJB21"/></property>
+ <property name="securityHandlerEJB3"><inject
bean="WSSecurityHandlerEJB3"/></property>
+ </bean>
+
+ <!-- Deployment aspect helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21"
class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3"
class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/>
+ <bean name="WSContainerMetaDataAdapter"
class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject
bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject
bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject
bean="WSWebMetaDataAdapter"/></property>
+ </bean>
+ <bean name="WSSecurityHandlerEJB21"
class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3"
class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
+ <bean name="WSWebAppDesciptorModifier"
class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/>
+ <bean name="WSWebMetaDataAdapter"
class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/>
+ <bean name="WSWebXMLRewriter"
class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl">
+ <property name="desciptorModifier"><inject
bean="WSWebAppDesciptorModifier"/></property>
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry"
class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject
bean="WSMBeanServerLocator"
property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+ <!-- Phase 1 -->
+ <bean name="WSDeploymentAspectInstallerPreJSE"
class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject
bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet"
elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSDeploymentAspectInstallerPostJSE"
class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject
bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet"
elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ </bean>
+
+ <bean name="WSDeploymentAspectInstallerEJB"
class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject
bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet"
elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="WSDeploymentAspectInstallerEndpointAPI"
class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject
bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">false</property>
+ <property name="aspects">
+ <set class="java.util.HashSet"
elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSEndpointAPIDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
Property changes on: stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-03-18 10:48:19
UTC (rev 5993)
+++ stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-03-18 10:55:56
UTC (rev 5994)
@@ -24,11 +24,6 @@
-->
</bean>
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry"
class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject
bean="WSMBeanServerLocator"
property="mbeanServer"/></property>
- </bean>
-
<!-- A subscription manager for WS-Eventing -->
<bean name="WSSubscriptionManager"
class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
<property name="bindAddress">${jboss.bind.address}</property>