Author: heiko.braun(a)jboss.com Date: 2008-06-04 09:22:11 -0400 (Wed, 04 Jun 2008) New Revision: 7341 Modified: container/jboss50/branches/jbossws-jboss500/pom.xml container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java Log: JBWS-2202: Container integration has a dpendency on framework Modified: container/jboss50/branches/jbossws-jboss500/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-06-04 13:21:37 UTC (rev 7340) +++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-06-04 13:22:11 UTC (rev 7341) @@ -41,15 +41,8 @@ <artifactId>jbossws-common</artifactId> <version>${jbossws.common.version}</version> </dependency> - - <!-- remove this dependency --> + <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <version>3.0.2-SNAPSHOT</version> - </dependency> - - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-vfs</artifactId> <version>${jboss.vfs.version}</version> @@ -110,13 +103,7 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> <scope>provided</scope> - </dependency> - <!-- FIXME: container integration should not have a dependency on framework --> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <scope>provided</scope> - </dependency> + </dependency> <!-- JBoss provided dependencies --> <dependency> Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-06-04 13:21:37 UTC (rev 7340) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-06-04 13:22:11 UTC (rev 7341) @@ -22,7 +22,7 @@ package org.jboss.wsf.container.jboss50.transport; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.transport.HttpListenerRef; +import org.jboss.wsf.spi.transport.HttpListenerRef; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-06-04 13:21:37 UTC (rev 7340) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-06-04 13:22:11 UTC (rev 7341) @@ -22,7 +22,7 @@ package org.jboss.wsf.container.jboss50.transport; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.transport.HttpListenerRef; +import org.jboss.wsf.spi.transport.HttpListenerRef; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java 2008-06-04 13:21:37 UTC (rev 7340) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java 2008-06-04 13:22:11 UTC (rev 7341) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.container.jboss50.transport; -import org.jboss.wsf.framework.transport.HttpListenerRef; +import org.jboss.wsf.spi.transport.HttpListenerRef; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java 2008-06-04 13:21:37 UTC (rev 7340) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java 2008-06-04 13:22:11 UTC (rev 7341) @@ -21,33 +21,27 @@ */ package org.jboss.wsf.container.jboss50.transport; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; - -import org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect; +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.dom4j.io.OutputFormat; +import org.dom4j.io.XMLWriter; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.WSFRuntime; 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.Endpoint; -import org.jboss.wsf.spi.deployment.SecurityHandler; -import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.deployment.*; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; -import org.dom4j.Document; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; -import org.dom4j.io.OutputFormat; -import org.dom4j.io.XMLWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; + /** * A deployer that generates a webapp for an EJB endpoint *