[jbossws-commits] JBossWS SVN: r11478 - framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment.

Author: alessio.soldano(a)jboss.com Date: 2010-01-25 05:13:29 -0500 (Mon, 25 Jan 2010) New Revision: 11478 Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java Log: Using new AbstractDeploymentAspect Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -21,19 +21,19 @@ */ package org.jboss.wsf.framework.deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; - import java.util.Iterator; import java.util.Map; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; +import org.jboss.wsf.spi.deployment.Deployment; + /** * Populate deployment context properties * * @author Thomas.Diesler(a)jboss.org * @since 19-May-2006 */ -public class ContextPropertiesDeploymentAspect extends DeploymentAspect +public class ContextPropertiesDeploymentAspect extends AbstractDeploymentAspect { // The configured service endpoint servlet private Map<String,String> contextProperties; Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -22,12 +22,12 @@ package org.jboss.wsf.framework.deployment; import org.jboss.ws.Constants; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.annotation.AuthMethod; import org.jboss.wsf.spi.annotation.TransportGuarantee; import org.jboss.wsf.spi.annotation.WebContext; 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.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; @@ -38,7 +38,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class ContextRootDeploymentAspect extends DeploymentAspect +public class ContextRootDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -21,14 +21,13 @@ */ package org.jboss.wsf.framework.deployment; -import java.io.IOException; import java.util.List; import java.util.Map; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.annotation.WebContext; -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.deployment.Deployment.DeploymentType; @@ -44,7 +43,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 19-May-2007 */ -public class EndpointAddressDeploymentAspect extends DeploymentAspect +public class EndpointAddressDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -21,10 +21,10 @@ */ package org.jboss.wsf.framework.deployment; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; 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.LifecycleHandler; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; @@ -44,12 +44,13 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class EndpointHandlerDeploymentAspect extends DeploymentAspect +public class EndpointHandlerDeploymentAspect extends AbstractDeploymentAspect { private SPIProvider spiProvider; public EndpointHandlerDeploymentAspect() { + super(); spiProvider = SPIProviderResolver.getInstance().getProvider(); } Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -21,7 +21,11 @@ */ package org.jboss.wsf.framework.deployment; -import org.jboss.wsf.spi.deployment.*; +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.LifecycleHandler; +import org.jboss.wsf.spi.deployment.Service; /** * A deployer that that calls the endpoint lifecycle handler @@ -29,7 +33,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class EndpointLifecycleDeploymentAspect extends DeploymentAspect +public class EndpointLifecycleDeploymentAspect extends AbstractDeploymentAspect { @Override Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -21,13 +21,13 @@ */ package org.jboss.wsf.framework.deployment; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.management.EndpointMetrics; import org.jboss.wsf.spi.management.EndpointMetricsFactory; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; /** * A deployer that assigns the metrics to the Endpoint @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 20-Jun-2007 */ -public class EndpointMetricsDeploymentAspect extends DeploymentAspect +public class EndpointMetricsDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -21,13 +21,13 @@ */ package org.jboss.wsf.framework.deployment; +import org.jboss.wsf.common.ObjectNameFactory; +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.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; -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.common.ObjectNameFactory; /** * A deployer that assigns the complete name to the Endpoint @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class EndpointNameDeploymentAspect extends DeploymentAspect +public class EndpointNameDeploymentAspect extends AbstractDeploymentAspect { @Override public void start(Deployment dep) Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -28,9 +28,9 @@ import javax.management.MBeanServer; import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.framework.management.recording.ManagedRecordProcessor; 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.management.recording.RecordProcessor; @@ -40,7 +40,7 @@ * @author alessio.soldano(a)jboss.org * @since 12-Dec-2007 */ -public class EndpointRecordProcessorDeploymentAspect extends DeploymentAspect +public class EndpointRecordProcessorDeploymentAspect extends AbstractDeploymentAspect { private MBeanServer mbeanServer; private List<RecordProcessor> processors; Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -21,20 +21,20 @@ */ package org.jboss.wsf.framework.deployment; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; -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.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; /** * A deployer that registers the endpoints * * @author Thomas.Diesler(a)jboss.com */ -public class EndpointRegistryDeploymentAspect extends DeploymentAspect +public class EndpointRegistryDeploymentAspect extends AbstractDeploymentAspect { private EndpointRegistry registry; Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/JAXBIntroDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -23,15 +23,14 @@ import java.io.IOException; import java.io.InputStream; -import java.util.Map; import org.jboss.jaxb.intros.BindingCustomizationFactory; import org.jboss.logging.Logger; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.binding.JAXBBindingCustomization; 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.UnifiedVirtualFile; @@ -41,7 +40,7 @@ * @author Heiko.Braun(a)jboss.com * @author alessio.soldano(a)jboss.com */ -public class JAXBIntroDeploymentAspect extends DeploymentAspect +public class JAXBIntroDeploymentAspect extends AbstractDeploymentAspect { private static Logger logger = Logger.getLogger(JAXBIntroDeploymentAspect.class); private static final String META_INF_JAXB_INTROS_XML = "META-INF/jaxb-intros.xml"; Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -26,12 +26,12 @@ import javax.jws.WebService; import org.jboss.ws.Constants; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.annotation.WebContext; 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.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; /** @@ -40,7 +40,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 19-May-2007 */ -public class URLPatternDeploymentAspect extends DeploymentAspect +public class URLPatternDeploymentAspect extends AbstractDeploymentAspect { @Override Modified: framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java =================================================================== --- framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java 2010-01-25 10:10:48 UTC (rev 11477) +++ framework/branches/jaxrpc-cxf/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java 2010-01-25 10:13:29 UTC (rev 11478) @@ -25,9 +25,9 @@ import java.util.Arrays; import java.util.List; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.annotation.WebContext; 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; @@ -37,7 +37,7 @@ * @author darran.lofthouse(a)jboss.com * @since 10-Jul-2008 */ -public class VirtualHostDeploymentAspect extends DeploymentAspect +public class VirtualHostDeploymentAspect extends AbstractDeploymentAspect { @Override