Author: alessio.soldano(a)jboss.com Date: 2010-01-25 05:21:43 -0500 (Mon, 25 Jan 2010) New Revision: 11480 Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/jbossws-native-config-as6.xml Log: Using new AbstractDeploymentAspect + moving WSAspectizedDeployerFactory to stack specific config file Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java =================================================================== --- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479) +++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480) @@ -23,9 +23,9 @@ import org.jboss.ws.extensions.wsrm.common.RMHelper; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.invocation.InvocationHandler; @@ -36,7 +36,7 @@ * * @since Dec 11, 2007 */ -public final class RMDeploymentAspect extends DeploymentAspect +public final class RMDeploymentAspect extends AbstractDeploymentAspect { @Override Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479) +++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480) @@ -22,7 +22,7 @@ package org.jboss.wsf.stack.jbws; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; /** @@ -31,7 +31,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class EagerInitializeDeploymentAspect extends DeploymentAspect +public class EagerInitializeDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java =================================================================== --- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479) +++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480) @@ -27,7 +27,7 @@ import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerFactory; import org.jboss.ws.extensions.eventing.mgmt.SubscriptionManagerMBean; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; @@ -38,7 +38,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class EventingDeploymentAspect extends DeploymentAspect +public class EventingDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java =================================================================== --- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479) +++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480) @@ -24,9 +24,9 @@ import java.io.IOException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; /** @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class PublishContractDeploymentAspect extends DeploymentAspect +public class PublishContractDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java =================================================================== --- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479) +++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480) @@ -23,7 +23,7 @@ import org.jboss.ws.core.server.ServiceEndpointInvoker; import org.jboss.ws.core.server.ServiceEndpointInvokerEJB21; -import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; @@ -34,7 +34,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class ServiceEndpointInvokerDeploymentAspect extends DeploymentAspect +public class ServiceEndpointInvokerDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2010-01-25 10:15:58 UTC (rev 11479) +++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2010-01-25 10:21:43 UTC (rev 11480) @@ -28,9 +28,9 @@ import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; @@ -40,7 +40,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class UnifiedMetaDataDeploymentAspect extends DeploymentAspect +public class UnifiedMetaDataDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/jbossws-native-config-as6.xml =================================================================== --- stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/jbossws-native-config-as6.xml 2010-01-25 10:15:58 UTC (rev 11479) +++ stack/native/branches/jaxrpc-cxf/modules/core/src/main/resources/jbossws-native-config-as6.xml 2010-01-25 10:21:43 UTC (rev 11480) @@ -2,6 +2,17 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> + <!-- WSDeploymentAspectDeployers factory --> + <bean name="WSAspectizedDeployersFactory" class="org.jboss.webservices.integration.deployers.WSAspectizedDeployersFactory"> + <constructor> + <parameter> + <inject bean="Deployers"/> + </parameter> + </constructor> + <incallback method="addDeployer"/> + <uncallback method="removeDeployer"/> + </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>