Author: richard.opalka(a)jboss.com Date: 2008-10-30 09:53:53 -0400 (Thu, 30 Oct 2008) New Revision: 8597 Added: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml Removed: stack/metro/branches/ropalka/modules/server/src/main/resources/as4-jbossws-metro-config.xml stack/metro/branches/ropalka/modules/server/src/main/resources/as5-jbossws-metro-config.xml Modified: stack/metro/branches/ropalka/modules/management/pom.xml stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml stack/metro/branches/ropalka/pom.xml Log: [JBWS-2338] removing WSFRuntime abstraction Modified: stack/metro/branches/ropalka/modules/management/pom.xml =================================================================== --- stack/metro/branches/ropalka/modules/management/pom.xml 2008-10-30 12:48:52 UTC (rev 8596) +++ stack/metro/branches/ropalka/modules/management/pom.xml 2008-10-30 13:53:53 UTC (rev 8597) @@ -54,21 +54,9 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR2</artifactId> - <classifier>container</classifier> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500x</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500x</artifactId> - <classifier>container</classifier> - <scope>runtime</scope> - </dependency> <!-- END --> <dependency> <groupId>org.jboss.jaxr</groupId> Modified: stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf =================================================================== --- stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-30 12:48:52 UTC (rev 8596) +++ stack/metro/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-30 13:53:53 UTC (rev 8597) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Deleted: stack/metro/branches/ropalka/modules/server/src/main/resources/as4-jbossws-metro-config.xml =================================================================== --- stack/metro/branches/ropalka/modules/server/src/main/resources/as4-jbossws-metro-config.xml 2008-10-30 12:48:52 UTC (rev 8596) +++ stack/metro/branches/ropalka/modules/server/src/main/resources/as4-jbossws-metro-config.xml 2008-10-30 13:53:53 UTC (rev 8597) @@ -1,118 +0,0 @@ - <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig"> - <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 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> - - <!-- Logging redirector --> - <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> - <property name="namespaces"> - <list class="java.util.LinkedList" elementClass="java.lang.String"> - <value>javax.enterprise.resource.webservices.jaxws</value> - <value>com.sun</value> - </list> - </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.metro.RequestHandlerFactoryImpl"/> - - <!-- - The stack specific deployment aspects - --> - - <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</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.metro.EndpointServlet</value></entry> - </map> - </property> - </bean> - - <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerEndpointHandler</property> - <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" 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="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect"> - <property name="requires">URLPattern,WebMetaData</property> - <property name="provides">StackDescriptor</property> - </bean> - - <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect"> - <property name="requires">RuntimeLoader,StackDescriptor</property> - <property name="provides">RuntimeModel</property> - </bean> - - <!-- - Deployment aspect installers - --> - - <bean name="WSMetroDeploymentAspectInstallerJSE" 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="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSRuntimeModelDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerJSE</depends> - </bean> - - <bean name="WSMetroDeploymentAspectInstallerEJB" 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="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - <inject bean="WSRuntimeModelDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerEJB</depends> - </bean> Deleted: stack/metro/branches/ropalka/modules/server/src/main/resources/as5-jbossws-metro-config.xml =================================================================== --- stack/metro/branches/ropalka/modules/server/src/main/resources/as5-jbossws-metro-config.xml 2008-10-30 12:48:52 UTC (rev 8596) +++ stack/metro/branches/ropalka/modules/server/src/main/resources/as5-jbossws-metro-config.xml 2008-10-30 13:53:53 UTC (rev 8597) @@ -1,141 +0,0 @@ - <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig"> - <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 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> - - <!-- Logging redirector --> - <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> - <property name="namespaces"> - <list class="java.util.LinkedList" elementClass="java.lang.String"> - <value>javax.enterprise.resource.webservices.jaxws</value> - <value>com.sun</value> - </list> - </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.metro.RequestHandlerFactoryImpl"/> - - <!-- - The stack specific deployment aspects - --> - - <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</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.metro.EndpointServlet</value></entry> - <entry><key>org.jboss.ws.webapp.ServletAspectManagerName</key><value>WSMetroServletAspectManager</value></entry> - </map> - </property> - </bean> - - <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerEndpointHandler</property> - <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" 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="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect"> - <property name="requires">URLPattern,WebMetaData</property> - <property name="provides">StackDescriptor</property> - </bean> - - <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect"> - <property name="requires">RuntimeLoader,StackDescriptor</property> - <property name="provides">RuntimeModel</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="WSMetroDeployersProvidedDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect"> - <property name="provides">RuntimeLoader,URLPattern,WebMetaData,StackDescriptor</property> - </bean> - - <!-- - The endpoint servlet DA manager - --> - - <bean name="WSMetroServletAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSMetroServletAspectManager</property> - </bean> - - <!-- - Deployment aspect installers - --> - - <bean name="WSMetroDeploymentAspectInstallerJSE" 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="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerJSE</depends> - </bean> - - <bean name="WSMetroDeploymentAspectInstallerEJB" 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="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerEJB</depends> - </bean> - - <bean name="WSMetroServletAspectManagerInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSMetroServletAspectManager"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSMetroDeployersProvidedDeploymentAspect"/><!-- hacky DA --> - <inject bean="WSRuntimeModelDeploymentAspect"/> - </set> - </property> - </bean> Added: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml =================================================================== --- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml (rev 0) +++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2008-10-30 13:53:53 UTC (rev 8597) @@ -0,0 +1,130 @@ + + <!-- An abstraction of server configuration aspects. --> + <bean name="WSServerConfig" class="org.jboss.wsf.stack.metro.MetroServerConfig"> + <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 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.wsf.framework.management.ManagedEndpointRegistry"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean> + + <!-- Logging redirector --> + <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> + <property name="namespaces"> + <list class="java.util.LinkedList" elementClass="java.lang.String"> + <value>javax.enterprise.resource.webservices.jaxws</value> + <value>com.sun</value> + </list> + </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> + + <!-- + The stack specific deployment aspects + --> + <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides">ContextProperties</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.metro.EndpointServlet</value></entry> + </map> + </property> + </bean> + + <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerEndpointHandler</property> + <property name="provides">StackEndpointHandler</property> + </bean> + + <bean name="WSMetroEndpointRecordProcessorDeploymentAspect" 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="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">StackDescriptor</property> + </bean> + + <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect"> + <property name="requires">RuntimeLoader, StackDescriptor</property> + <property name="provides">RuntimeModel</property> + </bean> + <!-- Deployment aspect installers --> + + <!-- Phase 1 --> + <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroContextPropertiesDeploymentAspect"/> + <inject bean="WSMetroDescriptorDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + + <!-- Phase 2 --> + <bean name="WSMetroDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> + <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSRuntimeModelDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPostJSE</depends> + </bean> + + <bean name="WSMetroDeploymentAspectInstallerEJB" 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="WSMetroContextPropertiesDeploymentAspect"/> + <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> + <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSMetroDescriptorDeploymentAspect"/> + <inject bean="WSRuntimeModelDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerEJB</depends> + </bean> Modified: stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-30 12:48:52 UTC (rev 8596) +++ stack/metro/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2008-10-30 13:53:53 UTC (rev 8597) @@ -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}/as4-jbossws-metro-config.xml"/> + <fileset file="${project.resources.directory}/jbossws-metro-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}/as4-jbossws-metro-config.xml"/> + <fileset file="${project.resources.directory}/jbossws-metro-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}/as4-jbossws-metro-config.xml"/> + <fileset file="${project.resources.directory}/jbossws-metro-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}/as5-jbossws-metro-config.xml"/> + <fileset file="${project.resources.directory}/jbossws-metro-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}/as5-jbossws-metro-config.xml"/> + <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> Modified: stack/metro/branches/ropalka/pom.xml =================================================================== --- stack/metro/branches/ropalka/pom.xml 2008-10-30 12:48:52 UTC (rev 8596) +++ stack/metro/branches/ropalka/pom.xml 2008-10-30 13:53:53 UTC (rev 8597) @@ -146,12 +146,6 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR2</artifactId> <version>${jbossws.jboss500.version}</version> - <classifier>container</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR2</artifactId> - <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> @@ -164,12 +158,6 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500x</artifactId> <version>${jbossws.jboss501.version}</version> - <classifier>container</classifier> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500x</artifactId> - <version>${jbossws.jboss501.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency>