[jboss-svn-commits] JBoss Common SVN: r4700 - in arquillian/trunk/containers: glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3 and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 8 07:48:54 EDT 2010
Author: aslak
Date: 2010-07-08 07:48:53 -0400 (Thu, 08 Jul 2010)
New Revision: 4700
Modified:
arquillian/trunk/containers/glassfish-embedded-3/pom.xml
arquillian/trunk/containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishEmbeddedContainer.java
arquillian/trunk/containers/jbossas-embedded-6/pom.xml
arquillian/trunk/containers/jbossas-embedded-6/src/main/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASEmbeddedContainer.java
arquillian/trunk/containers/jbossas-managed-6/pom.xml
arquillian/trunk/containers/jbossas-managed-6/src/main/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASLocalContainer.java
arquillian/trunk/containers/jbossas-remote-6/pom.xml
arquillian/trunk/containers/jbossas-remote-6/src/main/java/org/jboss/arquillian/container/jbossas/remote_6/JBossASRemoteContainer.java
arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedContainer.java
arquillian/trunk/containers/jetty-embedded-7/pom.xml
arquillian/trunk/containers/jetty-embedded-7/src/main/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedContainer.java
arquillian/trunk/containers/jsr88-remote-1.2/pom.xml
arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainer.java
arquillian/trunk/containers/tomcat-embedded-6/pom.xml
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java
Log:
ARQ-209 Updated Servlet 3.x Protocol References from Containers
Modified: arquillian/trunk/containers/glassfish-embedded-3/pom.xml
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-3/pom.xml 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/glassfish-embedded-3/pom.xml 2010-07-08 11:48:53 UTC (rev 4700)
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+ <artifactId>arquillian-protocol-servlet-3</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishEmbeddedContainer.java 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishEmbeddedContainer.java 2010-07-08 11:48:53 UTC (rev 4700)
@@ -35,7 +35,7 @@
import org.glassfish.api.embedded.ContainerBuilder;
import org.glassfish.api.embedded.EmbeddedFileSystem;
import org.glassfish.api.embedded.Server;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_3.ServletMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.Context;
Modified: arquillian/trunk/containers/jbossas-embedded-6/pom.xml
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-6/pom.xml 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jbossas-embedded-6/pom.xml 2010-07-08 11:48:53 UTC (rev 4700)
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+ <artifactId>arquillian-protocol-servlet-3</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/containers/jbossas-embedded-6/src/main/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-6/src/main/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASEmbeddedContainer.java 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jbossas-embedded-6/src/main/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASEmbeddedContainer.java 2010-07-08 11:48:53 UTC (rev 4700)
@@ -18,7 +18,7 @@
import java.net.URL;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_3.ServletMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.Context;
Modified: arquillian/trunk/containers/jbossas-managed-6/pom.xml
===================================================================
--- arquillian/trunk/containers/jbossas-managed-6/pom.xml 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jbossas-managed-6/pom.xml 2010-07-08 11:48:53 UTC (rev 4700)
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+ <artifactId>arquillian-protocol-servlet-3</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/containers/jbossas-managed-6/src/main/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASLocalContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-managed-6/src/main/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASLocalContainer.java 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jbossas-managed-6/src/main/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASLocalContainer.java 2010-07-08 11:48:53 UTC (rev 4700)
@@ -24,7 +24,7 @@
import java.util.logging.Logger;
import org.jboss.arquillian.container.jbossas.managed_6.utils.AsLifecycleDelegate;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_3.ServletMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.Context;
Modified: arquillian/trunk/containers/jbossas-remote-6/pom.xml
===================================================================
--- arquillian/trunk/containers/jbossas-remote-6/pom.xml 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jbossas-remote-6/pom.xml 2010-07-08 11:48:53 UTC (rev 4700)
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+ <artifactId>arquillian-protocol-servlet-3</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/containers/jbossas-remote-6/src/main/java/org/jboss/arquillian/container/jbossas/remote_6/JBossASRemoteContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-6/src/main/java/org/jboss/arquillian/container/jbossas/remote_6/JBossASRemoteContainer.java 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jbossas-remote-6/src/main/java/org/jboss/arquillian/container/jbossas/remote_6/JBossASRemoteContainer.java 2010-07-08 11:48:53 UTC (rev 4700)
@@ -29,7 +29,7 @@
import javax.naming.InitialContext;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_3.ServletMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.Context;
Modified: arquillian/trunk/containers/jetty-embedded-6.1/pom.xml
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/pom.xml 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jetty-embedded-6.1/pom.xml 2010-07-08 11:48:53 UTC (rev 4700)
@@ -46,7 +46,7 @@
<!-- TODO We likely need a servlet packager to restrict use of EAR -->
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+ <artifactId>arquillian-protocol-servlet-333</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedContainer.java 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedContainer.java 2010-07-08 11:48:53 UTC (rev 4700)
@@ -19,7 +19,7 @@
import java.net.URL;
import java.util.logging.Logger;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_3.ServletMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.Context;
Modified: arquillian/trunk/containers/jetty-embedded-7/pom.xml
===================================================================
--- arquillian/trunk/containers/jetty-embedded-7/pom.xml 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jetty-embedded-7/pom.xml 2010-07-08 11:48:53 UTC (rev 4700)
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+ <artifactId>arquillian-protocol-servlet-3</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/containers/jetty-embedded-7/src/main/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-7/src/main/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedContainer.java 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jetty-embedded-7/src/main/java/org/jboss/arquillian/container/jetty/embedded_7/JettyEmbeddedContainer.java 2010-07-08 11:48:53 UTC (rev 4700)
@@ -24,7 +24,7 @@
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_3.ServletMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.Context;
Modified: arquillian/trunk/containers/jsr88-remote-1.2/pom.xml
===================================================================
--- arquillian/trunk/containers/jsr88-remote-1.2/pom.xml 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jsr88-remote-1.2/pom.xml 2010-07-08 11:48:53 UTC (rev 4700)
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+ <artifactId>arquillian-protocol-servlet-3</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainer.java
===================================================================
--- arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainer.java 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainer.java 2010-07-08 11:48:53 UTC (rev 4700)
@@ -29,7 +29,7 @@
import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.enterprise.deploy.spi.status.ProgressObject;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_3.ServletMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.Context;
Modified: arquillian/trunk/containers/tomcat-embedded-6/pom.xml
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/pom.xml 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/tomcat-embedded-6/pom.xml 2010-07-08 11:48:53 UTC (rev 4700)
@@ -42,7 +42,7 @@
<!-- Not yet working w/o a hack -->
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-ee6</artifactId>
+ <artifactId>arquillian-protocol-servlet-3</artifactId>
<version>${project.version}</version>
</dependency>
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java 2010-07-08 11:47:53 UTC (rev 4699)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java 2010-07-08 11:48:53 UTC (rev 4700)
@@ -31,7 +31,7 @@
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Embedded;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_3.ServletMethodExecutor;
import org.jboss.arquillian.spi.Configuration;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.Context;
More information about the jboss-svn-commits
mailing list