Author: alessio.soldano(a)jboss.com Date: 2010-02-18 10:53:51 -0500 (Thu, 18 Feb 2010) New Revision: 11614 Modified: container/jboss50/branches/jbossws-jboss501/pom.xml container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java Log: [JBWS-2895] Updating AS 5.0.1 container integration to new spi Modified: container/jboss50/branches/jbossws-jboss501/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/pom.xml 2010-02-18 15:34:02 UTC (rev 11613) +++ container/jboss50/branches/jbossws-jboss501/pom.xml 2010-02-18 15:53:51 UTC (rev 11614) @@ -6,26 +6,26 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> - <version>3.2.1.GA</version> + <version>3.3.0-SNAPSHOT</version> <!-- Parent --> <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.3.GA</version> + <version>1.0.4.GA</version> </parent> <!-- Source Control Management --> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jb... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/contai... - <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/tags/jb... + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/jb... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/contai... + <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss50/branche... </scm> <!-- Properties --> <properties> - <jbossws.common.version>1.2.1.GA</jbossws.common.version> - <jbossws.spi.version>1.2.1.GA</jbossws.spi.version> + <jbossws.common.version>1.3.0-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>1.3.0-SNAPSHOT</jbossws.spi.version> <!-- JBoss component versions taken from Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614) @@ -44,9 +44,9 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.common.injection.resolvers.ResourceReferenceResolver; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.common.integration.WSHelper; 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.integration.WebServiceDeclaration; import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; @@ -59,7 +59,7 @@ * * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a> */ -public final class InjectionMetaDataDeploymentAspect extends DeploymentAspect +public final class InjectionMetaDataDeploymentAspect extends AbstractDeploymentAspect { /** EJB 3 JNDI prefix. */ Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614) @@ -21,9 +21,9 @@ */ package org.jboss.webservices.integration.metadata; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; @@ -33,7 +33,7 @@ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> */ -public final class ContainerMetaDataDeploymentAspect extends DeploymentAspect +public final class ContainerMetaDataDeploymentAspect extends AbstractDeploymentAspect { /** JSE meta data builder. */ Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614) @@ -26,9 +26,9 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.web.WebPermissionMapping; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; /** * Generates JACC permissions. (This is temporary and really hacky solution). @@ -39,7 +39,7 @@ * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public final class JACCPermissionsDeploymentAspect extends DeploymentAspect +public final class JACCPermissionsDeploymentAspect extends AbstractDeploymentAspect { /** Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614) @@ -21,9 +21,9 @@ */ package org.jboss.webservices.integration.tomcat; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; /** * A deployment aspect that generates web app meta data for EJB endpoints. @@ -31,7 +31,7 @@ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> */ -public final class WebMetaDataCreatingDeploymentAspect extends DeploymentAspect +public final class WebMetaDataCreatingDeploymentAspect extends AbstractDeploymentAspect { /** Web meta data creator. */ Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2010-02-18 15:34:02 UTC (rev 11613) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2010-02-18 15:53:51 UTC (rev 11614) @@ -21,8 +21,8 @@ */ package org.jboss.webservices.integration.tomcat; +import org.jboss.wsf.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; /** * Modifies web meta data to configure webservice stack endpoints and properties. @@ -30,7 +30,7 @@ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> */ -public final class WebMetaDataModifyingDeploymentAspect extends DeploymentAspect +public final class WebMetaDataModifyingDeploymentAspect extends AbstractDeploymentAspect { /** Web meta data modifier. */