Author: richard.opalka(a)jboss.com Date: 2008-11-03 05:51:29 -0500 (Mon, 03 Nov 2008) New Revision: 8627 Added: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml Removed: 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 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2338] svn merge -r 8579:8599 https://svn.jboss.org/repos/jbossws/stack/native/branches/ropalka Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-11-03 10:51:29 UTC (rev 8627) @@ -28,7 +28,6 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.WSFRuntime; /** * Registers RMInvocationHandler if WS-RM is detected @@ -41,7 +40,7 @@ { @Override - public final void start(Deployment dep, WSFRuntime runtime) + public final void start(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { @@ -61,7 +60,7 @@ } @Override - public final void destroy(Deployment dep, WSFRuntime runtime) + public final void destroy(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-11-03 10:51:29 UTC (rev 8627) @@ -24,7 +24,6 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that initializes the UMDM @@ -35,7 +34,7 @@ public class EagerInitializeDeploymentAspect extends DeploymentAspect { @Override - public void start(Deployment dep, WSFRuntime runtime) + public void start(Deployment dep) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-11-03 10:51:29 UTC (rev 8627) @@ -30,7 +30,6 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that creates event sources and register them with the @@ -42,7 +41,7 @@ public class EventingDeploymentAspect extends DeploymentAspect { @Override - public void start(Deployment dep, WSFRuntime runtime) + public void start(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { @@ -71,7 +70,7 @@ } @Override - public void destroy(Deployment dep, WSFRuntime runtime) + public void destroy(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-11-03 10:51:29 UTC (rev 8627) @@ -29,7 +29,6 @@ import org.jboss.ws.core.jaxws.JAXBBindingCustomization; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.deployment.*; -import org.jboss.wsf.spi.WSFRuntime; import java.io.IOException; import java.io.InputStream; @@ -43,7 +42,7 @@ private static final String META_INF_JAXB_INTROS_XML = "META-INF/jaxb-intros.xml"; private static final String WEB_INF_JAXB_INTROS_XML = "WEB-INF/jaxb-intros.xml"; - public void start(Deployment deployment, WSFRuntime runtime) + public void start(Deployment deployment) { // assert ArchiveDeployment Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-11-03 10:51:29 UTC (rev 8627) @@ -28,7 +28,6 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that publishes the wsdl @@ -39,7 +38,7 @@ public class PublishContractDeploymentAspect extends DeploymentAspect { @Override - public void start(Deployment dep, WSFRuntime runtime) + public void start(Deployment dep) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-11-03 10:51:29 UTC (rev 8627) @@ -27,7 +27,6 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that associates the ServiceEndpointInvoker with the endpoint @@ -38,7 +37,7 @@ public class ServiceEndpointInvokerDeploymentAspect extends DeploymentAspect { @Override - public void start(Deployment dep, WSFRuntime runtime) + public void start(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-11-03 10:51:29 UTC (rev 8627) @@ -33,7 +33,6 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that builds the UnifiedDeploymentInfo @@ -44,7 +43,7 @@ public class UnifiedMetaDataDeploymentAspect extends DeploymentAspect { @Override - public void start(Deployment dep, WSFRuntime runtime) + public void start(Deployment dep) { UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) Deleted: 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 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/resources/as4-jbossws-native-config.xml 2008-11-03 10:51:29 UTC (rev 8627) @@ -1,165 +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"> - <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> Deleted: 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 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/resources/as5-jbossws-native-config.xml 2008-11-03 10:51:29 UTC (rev 8627) @@ -1,175 +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> - <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> - - <!-- 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,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"/> - </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"/> - </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"/> - </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="WSJAXBIntroDeploymentAspect"/> - </set> - </property> - </bean> Copied: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml (from rev 8599, stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml) =================================================================== --- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml (rev 0) +++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config.xml 2008-11-03 10:51:29 UTC (rev 8627) @@ -0,0 +1,174 @@ + <!-- 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> + + <!-- 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> + </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="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 --> + <!-- Phase 1 --> + <bean name="WSNativeDeploymentAspectInstallerPreJSE" 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="WSNativeContextPropertiesDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + <!-- Phase 2 --> + <bean name="WSNativeDeploymentAspectInstallerPostJSE" 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="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>WSDeploymentAspectInstallerPostJSE</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-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-11-03 10:51:29 UTC (rev 8627) @@ -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-native-config.xml"/> + <fileset file="${project.resources.directory}/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}/as4-jbossws-native-config.xml"/> + <fileset file="${project.resources.directory}/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}/as4-jbossws-native-config.xml"/> + <fileset file="${project.resources.directory}/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}/as5-jbossws-native-config.xml"/> + <fileset file="${project.resources.directory}/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}/as5-jbossws-native-config.xml"/> + <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/management/pom.xml 2008-11-03 10:51:29 UTC (rev 8627) @@ -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/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-11-03 10:51:29 UTC (rev 8627) @@ -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 Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-03 10:51:29 UTC (rev 8627) @@ -345,42 +345,14 @@ <!-- END --> </sequential> </macrodef> - + <!-- ================================================================== --> - <!-- Deploy Deploy --> - <!-- ================================================================== --> - - <!-- [JBWS-2263] --> - <!-- START --> - <macrodef name="macro-deploy-jbossws-deploy50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; - </fileset> - </copy> - <unzip dest="@{targetdir}" src=&quot;@{targetdir}/jbossws-(a){jbossid}-container.jar&quot;&gt; - <patternset> - <include name="META-INF/jbossws-container-jboss-beans.xml"/> - </patternset> - </unzip> - <move file=&quot;(a){targetdir}/META-INF/jbossws-container-jboss-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws-container-jboss-beans.xml&quot;/&gt; - <delete file=&quot;@{targetdir}/jbossws-(a){jbossid}-container.jar&quot;/&gt; - <delete dir="@{targetdir}/META-INF"/> - </sequential> - </macrodef> - <!-- END --> - - <!-- ================================================================== --> <!-- Deploy JBossWS --> <!-- ================================================================== --> - + <!-- JDK Detection --> <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - + <target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -397,10 +369,6 @@ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <!-- [JBWS-2263] --> - <!-- START --> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deployers/jbossws.deployer/META-INF" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <!-- END --> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> @@ -460,12 +428,12 @@ <sequential> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - + <property name="jboss.server.home" value="@{targetdir}/../.."/> <property name="jboss.home" value="${jboss.server.home}/../.."/> <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - + <!-- [JBWS-2263] --> <!-- START --> <!-- delete stale container integration jars --> @@ -483,15 +451,14 @@ <delete> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> - + <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> - + <!-- delete juddi-service.sar --> <delete dir="@{targetdir}/../juddi-service.sar"/> - + </sequential> </macrodef> - - + </project> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/pom.xml 2008-11-03 10:51:29 UTC (rev 8627) @@ -56,7 +56,7 @@ <jbossws.jboss424.version>3.0.4.GA</jbossws.jboss424.version> <!-- [JBWS-2263] --> <!-- START --> - <jbossws.jboss500.version>3.0.4.GA</jbossws.jboss500.version> + <jbossws.jboss500.version>3.0.5-SNAPSHOT</jbossws.jboss500.version> <jbossws.jboss501.version>3.0.5-SNAPSHOT</jbossws.jboss501.version> <!-- END --> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> @@ -156,12 +156,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> @@ -174,12 +168,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> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-03 10:51:12 UTC (rev 8626) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-03 10:51:29 UTC (rev 8627) @@ -130,26 +130,6 @@ <include>*:jbossws-jboss500x:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss500-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jbossws-jboss500CR2:jar:container</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss501-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jbossws-jboss500x:jar:container</include> - </includes> - </dependencySet> <!-- END --> </dependencySets> </binaries>