[jbossws-commits] JBossWS SVN: r8369 - in stack/native/trunk/modules/core/src/main: scripts and 1 other directory.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Tue Oct 7 10:46:05 EDT 2008


Author: richard.opalka at jboss.com
Date: 2008-10-07 10:46:04 -0400 (Tue, 07 Oct 2008)
New Revision: 8369

Added:
   stack/native/trunk/modules/core/src/main/resources/as4-jbossws-native-config.xml
   stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml
Removed:
   stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml
Modified:
   stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring - switch AS 5 beans to new deployment model, ensure old AS 4 beans are backward compatible

Added: stack/native/trunk/modules/core/src/main/resources/as4-jbossws-native-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/as4-jbossws-native-config.xml	                        (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/as4-jbossws-native-config.xml	2008-10-07 14:46:04 UTC (rev 8369)
@@ -0,0 +1,165 @@
+  <!-- An abstraction of server configuration aspects. -->
+  <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig">
+    <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+    <!--
+      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 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>
+
+  <!-- A subscription manager for WS-Eventing -->
+  <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+    <property name="bindAddress">${jboss.bind.address}</property>
+  </bean>
+
+  <!-- Installed Record Processors-->
+  <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+    <property name="recording">false</property>
+  </bean>
+
+  <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+    <property name="recording">false</property>
+  </bean>
+
+  <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl"/>
+
+  <!--
+    The stack specific deployment aspects
+  -->
+
+  <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+    <property name="provides">ContextProperties,StackDescriptor</property>
+    <property name="contextProperties">
+      <map keyClass="java.lang.String" valueClass="java.lang.String">
+        <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
+      </map>
+    </property>
+  </bean>
+
+  <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+    <property name="requires">UnifiedMetaDataModel</property>
+    <property name="provides">InitializedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+    <property name="requires">ContainerEndpointHandler,ContainerMetaData</property>
+    <property name="provides">StackEndpointHandler</property>
+  </bean>
+
+  <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+    <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+    <property name="requires">RegisteredEndpoint</property>
+    <property name="provides">EndpointRecordProcessors</property>
+    <property name="processors">
+      <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+        <inject bean="WSMemoryBufferRecorder"/>
+        <inject bean="WSLogRecorder"/>
+      </list>
+    </property>
+  </bean>
+
+  <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
+    <property name="requires">UnifiedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+    <property name="requires">UnifiedMetaDataModel,JAXBIntros</property>
+    <property name="provides">PublishedContract</property>
+  </bean>
+
+  <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+    <property name="requires">UnifiedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
+    <property name="requires">StackEndpointHandler,UnifiedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+    <property name="requires">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,JAXBIntros</property>
+    <property name="provides">UnifiedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
+    <property name="provides">JAXBIntros</property>
+  </bean>
+
+  <!--
+    Deployment aspect installers
+  -->
+
+  <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+    <property name="sortAspectsOnCreate">true</property>
+    <property name="aspects">
+      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+        <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+        <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+        <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+        <inject bean="WSNativeEventingDeploymentAspect"/>
+        <inject bean="WSNativePublishContractDeploymentAspect"/>
+        <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+        <inject bean="WSNativeRMDeploymentAspect"/>
+        <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+        <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+        <inject bean="WSJAXBIntroDeploymentAspect"/>
+      </set>
+    </property>
+    <depends>WSDeploymentAspectInstallerJSE</depends>
+  </bean>
+
+  <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+    <property name="sortAspectsOnCreate">true</property>
+    <property name="aspects">
+      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+        <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+        <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+        <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+        <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+        <inject bean="WSNativeEventingDeploymentAspect"/>
+        <inject bean="WSNativePublishContractDeploymentAspect"/>
+        <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+        <inject bean="WSNativeRMDeploymentAspect"/>
+        <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+        <inject bean="WSJAXBIntroDeploymentAspect"/>
+      </set>
+    </property>
+    <depends>WSDeploymentAspectInstallerEJB</depends>
+  </bean>
+
+  <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+    <property name="sortAspectsOnCreate">true</property>
+    <property name="aspects">
+      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+        <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+        <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+        <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+        <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+        <inject bean="WSNativeEventingDeploymentAspect"/>
+        <inject bean="WSNativePublishContractDeploymentAspect"/>
+        <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+        <inject bean="WSNativeRMDeploymentAspect"/>
+        <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+        <inject bean="WSJAXBIntroDeploymentAspect"/>
+      </set>
+    </property>
+    <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
+  </bean>

Added: stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml	                        (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml	2008-10-07 14:46:04 UTC (rev 8369)
@@ -0,0 +1,182 @@
+  <!-- An abstraction of server configuration aspects. -->
+  <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig">
+    <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+    <!--
+      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 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>
+
+  <!-- A subscription manager for WS-Eventing -->
+  <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+    <property name="bindAddress">${jboss.bind.address}</property>
+  </bean>
+
+  <!-- Installed Record Processors-->
+  <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+    <property name="recording">false</property>
+  </bean>
+
+  <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+    <property name="recording">false</property>
+  </bean>
+
+  <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl"/>
+
+  <!--
+    The stack specific deployment aspects
+  -->
+
+  <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+    <property name="provides">ContextProperties,StackDescriptor</property>
+    <property name="contextProperties">
+      <map keyClass="java.lang.String" valueClass="java.lang.String">
+        <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.AspectizedEndpointServlet</value></entry>
+        <entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSNativeServletAspectManager</value></entry>
+      </map>
+    </property>
+  </bean>
+
+  <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+    <property name="requires">UnifiedMetaDataModel</property>
+    <property name="provides">InitializedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+    <property name="requires">ContainerEndpointHandler,ContainerMetaData</property>
+    <property name="provides">StackEndpointHandler</property>
+  </bean>
+
+  <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+    <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+    <property name="requires">RegisteredEndpoint</property>
+    <property name="provides">EndpointRecordProcessors</property>
+    <property name="processors">
+      <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+        <inject bean="WSMemoryBufferRecorder"/>
+        <inject bean="WSLogRecorder"/>
+      </list>
+    </property>
+  </bean>
+
+  <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
+    <property name="requires">UnifiedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+    <property name="requires">UnifiedMetaDataModel,JAXBIntros</property>
+    <property name="provides">PublishedContract</property>
+  </bean>
+
+  <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+    <property name="requires">UnifiedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
+    <property name="requires">StackEndpointHandler,UnifiedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+    <property name="requires">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,JAXBIntros</property>
+    <property name="provides">UnifiedMetaDataModel</property>
+  </bean>
+
+  <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
+    <property name="provides">JAXBIntros</property>
+  </bean>
+
+  <bean name="WSEndpointServletLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointServletLifecycleDeploymentAspect">
+    <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
+  </bean>
+
+  <!-- This is hacky DA because endpoint servlet DAs depend on deployers DAs. But servlet DAs and deployers DAs are not in the same DA chain -->
+  <bean name="WSNativeDeployersProvidedDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect">
+    <property name="provides">RuntimeLoader,ContainerMetaData,URLPattern,VFSRoot,JAXBIntros,StackEndpointHandler</property>
+  </bean>
+
+  <!--
+    The endpoint servlet DA manager
+  -->
+
+  <bean name="WSNativeServletAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+    <property name="name">WSNativeServletAspectManager</property>
+  </bean>
+
+  <!--
+    Deployment aspect installers
+  -->
+
+  <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+    <property name="sortAspectsOnCreate">true</property>
+    <property name="aspects">
+      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+        <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+        <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+        <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+        <inject bean="WSJAXBIntroDeploymentAspect"/>
+      </set>
+    </property>
+    <depends>WSDeploymentAspectInstallerJSE</depends>
+  </bean>
+
+  <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+    <property name="sortAspectsOnCreate">true</property>
+    <property name="aspects">
+      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+        <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+        <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+        <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+        <inject bean="WSJAXBIntroDeploymentAspect"/>
+      </set>
+    </property>
+    <depends>WSDeploymentAspectInstallerEJB</depends>
+  </bean>
+
+  <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+    <property name="sortAspectsOnCreate">true</property>
+    <property name="aspects">
+      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+        <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+        <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+        <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+        <inject bean="WSJAXBIntroDeploymentAspect"/>
+      </set>
+    </property>
+    <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
+  </bean>
+
+  <bean name="WSNativeServletAspectManagerInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+    <property name="manager"><inject bean="WSNativeServletAspectManager"/></property>
+    <property name="sortAspectsOnCreate">true</property>
+    <property name="aspects">
+      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+        <inject bean="WSNativeDeployersProvidedDeploymentAspect"/><!-- hacky DA -->
+        <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+        <inject bean="WSNativeEventingDeploymentAspect"/>
+        <inject bean="WSNativePublishContractDeploymentAspect"/>
+        <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+        <inject bean="WSNativeRMDeploymentAspect"/>
+        <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+        <inject bean="WSEndpointServletLifecycleDeploymentAspect"/>
+      </set>
+    </property>
+  </bean>

Deleted: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml	2008-10-07 14:41:27 UTC (rev 8368)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml	2008-10-07 14:46:04 UTC (rev 8369)
@@ -1,171 +0,0 @@
-
-<!-- An abstraction of server configuration aspects. -->
-<bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig">
-   <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
-   <!--
-       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 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>
-
-  <!-- A subscription manager for WS-Eventing -->
-<bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
-   <property name="bindAddress">${jboss.bind.address}</property>
-</bean>
-
-  <!-- Installed Record Processors-->
-<bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
-   <property name="recording">false</property>
-</bean>
-
-<bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
-   <property name="recording">false</property>
-</bean>
-
-  <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl"/>
-
-  <!--
-  *********************************************************************************************************************
-    The stack specific deployment aspects
-  -->
-<bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
-   <property name="provides">ContextProperties, StackDescriptor</property>
-   <property name="contextProperties">
-      <map keyClass="java.lang.String" valueClass="java.lang.String">
-         <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
-      </map>
-   </property>
-</bean>
-
-<bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
-   <property name="requires">UnifiedMetaDataModel</property>
-   <property name="provides">InitializedMetaDataModel</property>
-</bean>
-
-<bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
-   <property name="requires">ContainerEndpointHandler, ContainerMetaData</property>
-   <property name="provides">StackEndpointHandler</property>
-</bean>
-
-<bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
-   <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-   <property name="requires">RegisteredEndpoint</property>
-   <property name="provides">EndpointRecordProcessors</property>
-   <property name="processors">
-      <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
-         <inject bean="WSMemoryBufferRecorder"/>
-         <inject bean="WSLogRecorder"/>
-      </list>
-   </property>
-</bean>
-
-<bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
-   <property name="requires">UnifiedMetaDataModel</property>
-</bean>
-
-<bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
-   <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
-   <property name="provides">PublishedContract</property>
-</bean>
-
-<bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
-   <property name="requires">UnifiedMetaDataModel</property>
-</bean>
-
-<bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
-   <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
-</bean>
-
-<bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
-   <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
-   <property name="provides">UnifiedMetaDataModel</property>
-</bean>
-
-<bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
-   <property name="provides">JAXBIntros</property>
-</bean>
-
-  <!--
-  *********************************************************************************************************************
-  Deployment aspect installers
-  -->
-
-<bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
-   <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
-   <property name="sortAspectsOnCreate">true</property>
-   <property name="aspects">
-      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
-         <!-- phase 1-->
-         <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
-
-         <!-- phase 2 -->
-         <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
-         <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
-         <inject bean="WSNativeEventingDeploymentAspect"/>
-         <inject bean="WSNativePublishContractDeploymentAspect"/>
-         <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
-         <inject bean="WSNativeRMDeploymentAspect"/>
-         <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
-         <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
-         <inject bean="WSJAXBIntroDeploymentAspect"/>
-      </set>
-   </property>
-   <depends>WSDeploymentAspectInstallerJSE</depends>
-</bean>
-
-<bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
-   <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
-   <property name="sortAspectsOnCreate">true</property>
-   <property name="aspects">
-      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
-         <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
-         <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
-         <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
-         <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
-         <inject bean="WSNativeEventingDeploymentAspect"/>
-         <inject bean="WSNativePublishContractDeploymentAspect"/>
-         <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
-         <inject bean="WSNativeRMDeploymentAspect"/>
-         <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
-         <inject bean="WSJAXBIntroDeploymentAspect"/>
-      </set>
-   </property>
-   <depends>WSDeploymentAspectInstallerEJB</depends>
-</bean>
-
-<bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
-   <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
-   <property name="sortAspectsOnCreate">true</property>
-   <property name="aspects">
-      <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
-         <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
-         <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
-         <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
-         <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
-         <inject bean="WSNativeEventingDeploymentAspect"/>
-         <inject bean="WSNativePublishContractDeploymentAspect"/>
-         <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
-         <inject bean="WSNativeRMDeploymentAspect"/>
-         <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
-         <inject bean="WSJAXBIntroDeploymentAspect"/>
-      </set>
-   </property>
-   <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
-</bean>
-

Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml	2008-10-07 14:41:27 UTC (rev 8368)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml	2008-10-07 14:46:04 UTC (rev 8369)
@@ -33,7 +33,7 @@
       <header trimleading="yes">
         &lt;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"&gt; </header>
-      <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+      <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/>
       <fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
       <footer trimleading="yes">
         &lt;/deployment&gt; </footer>
@@ -45,7 +45,7 @@
       <header trimleading="yes">
         &lt;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"&gt; </header>
-      <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+      <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/>
       <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
       <footer trimleading="yes">
         &lt;/deployment&gt; </footer>
@@ -57,7 +57,7 @@
       <header trimleading="yes">
         &lt;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"&gt; </header>
-      <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+      <fileset file="${project.resources.directory}/as4-jbossws-native-config.xml"/>
       <fileset file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/>
       <footer trimleading="yes">
         &lt;/deployment&gt; </footer>
@@ -68,7 +68,7 @@
     <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
       <header trimleading="yes">
         &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header>
-      <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+      <fileset file="${project.resources.directory}/as5-jbossws-native-config.xml"/>
       <footer trimleading="yes">
         &lt;/deployment&gt; </footer>
     </concat>
@@ -78,7 +78,7 @@
     <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
       <header trimleading="yes">
         &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header>
-      <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+      <fileset file="${project.resources.directory}/as5-jbossws-native-config.xml"/>
       <footer trimleading="yes">
         &lt;/deployment&gt; </footer>
     </concat>




More information about the jbossws-commits mailing list