[jboss-svn-commits] JBoss Common SVN: r4696 - in arquillian/trunk: containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1 and 6 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-07-08 06:47:56 -0400 (Thu, 08 Jul 2010)
New Revision: 4696

Modified:
   arquillian/trunk/containers/jbossas-managed-5.1/pom.xml
   arquillian/trunk/containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASLocalContainer.java
   arquillian/trunk/containers/jbossas-remote-5.1/pom.xml
   arquillian/trunk/containers/jbossas-remote-5.1/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_1/JBossASRemoteContainer.java
   arquillian/trunk/containers/jbossas-remote-5/pom.xml
   arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_0/JBossASRemoteContainer.java
   arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet_2_5/ProtocolDeploymentAppender.java
   arquillian/trunk/protocols/servlet-ee5/src/main/resources/org/jboss/arquillian/protocol/servlet_2_5/web.xml
Log:
ARQ-209 Updated Servlet 2.5 protocol reference from Containers


Modified: arquillian/trunk/containers/jbossas-managed-5.1/pom.xml
===================================================================
--- arquillian/trunk/containers/jbossas-managed-5.1/pom.xml	2010-07-08 10:44:27 UTC (rev 4695)
+++ arquillian/trunk/containers/jbossas-managed-5.1/pom.xml	2010-07-08 10:47:56 UTC (rev 4696)
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet-ee5</artifactId>
+            <artifactId>arquillian-protocol-servlet-2.5</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

Modified: arquillian/trunk/containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASLocalContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASLocalContainer.java	2010-07-08 10:44:27 UTC (rev 4695)
+++ arquillian/trunk/containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASLocalContainer.java	2010-07-08 10:47:56 UTC (rev 4696)
@@ -23,7 +23,7 @@
 import java.util.List;
 
 import org.jboss.arquillian.container.jbossas.managed_5_1.utils.AsLifecycleDelegate;
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_2_5.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-5/pom.xml
===================================================================
--- arquillian/trunk/containers/jbossas-remote-5/pom.xml	2010-07-08 10:44:27 UTC (rev 4695)
+++ arquillian/trunk/containers/jbossas-remote-5/pom.xml	2010-07-08 10:47:56 UTC (rev 4696)
@@ -40,7 +40,7 @@
       </dependency>
       <dependency>
          <groupId>org.jboss.arquillian.protocol</groupId>
-         <artifactId>arquillian-protocol-servlet-ee5</artifactId>
+         <artifactId>arquillian-protocol-servlet-2.5</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

Modified: arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_0/JBossASRemoteContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_0/JBossASRemoteContainer.java	2010-07-08 10:44:27 UTC (rev 4695)
+++ arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_0/JBossASRemoteContainer.java	2010-07-08 10:47:56 UTC (rev 4696)
@@ -29,7 +29,7 @@
 
 import javax.naming.InitialContext;
 
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_2_5.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-5.1/pom.xml
===================================================================
--- arquillian/trunk/containers/jbossas-remote-5.1/pom.xml	2010-07-08 10:44:27 UTC (rev 4695)
+++ arquillian/trunk/containers/jbossas-remote-5.1/pom.xml	2010-07-08 10:47:56 UTC (rev 4696)
@@ -40,7 +40,7 @@
       </dependency>
       <dependency>
          <groupId>org.jboss.arquillian.protocol</groupId>
-         <artifactId>arquillian-protocol-servlet-ee5</artifactId>
+         <artifactId>arquillian-protocol-servlet-2.5</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>

Modified: arquillian/trunk/containers/jbossas-remote-5.1/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_1/JBossASRemoteContainer.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-5.1/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_1/JBossASRemoteContainer.java	2010-07-08 10:44:27 UTC (rev 4695)
+++ arquillian/trunk/containers/jbossas-remote-5.1/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_1/JBossASRemoteContainer.java	2010-07-08 10:47:56 UTC (rev 4696)
@@ -29,7 +29,7 @@
 
 import javax.naming.InitialContext;
 
-import org.jboss.arquillian.protocol.servlet.ServletMethodExecutor;
+import org.jboss.arquillian.protocol.servlet_2_5.ServletMethodExecutor;
 import org.jboss.arquillian.spi.Configuration;
 import org.jboss.arquillian.spi.ContainerMethodExecutor;
 import org.jboss.arquillian.spi.Context;

Modified: arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet_2_5/ProtocolDeploymentAppender.java
===================================================================
--- arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet_2_5/ProtocolDeploymentAppender.java	2010-07-08 10:44:27 UTC (rev 4695)
+++ arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet_2_5/ProtocolDeploymentAppender.java	2010-07-08 10:47:56 UTC (rev 4696)
@@ -36,7 +36,7 @@
    public Archive<?> createAuxiliaryArchive()
    {
       WebArchive archive = ShrinkWrap.create(WebArchive.class, "arquillian-protocol.war")
-                     .setWebXML("org/jboss/arquillian/protocol/servlet/web.xml")
+                     .setWebXML("org/jboss/arquillian/protocol/servlet_2_5/web.xml")
                      .addClasses(
                            SecurityActions.class,
                            ServletTestRunner.class

Modified: arquillian/trunk/protocols/servlet-ee5/src/main/resources/org/jboss/arquillian/protocol/servlet_2_5/web.xml
===================================================================
--- arquillian/trunk/protocols/servlet-ee5/src/main/resources/org/jboss/arquillian/protocol/servlet_2_5/web.xml	2010-07-08 10:44:27 UTC (rev 4695)
+++ arquillian/trunk/protocols/servlet-ee5/src/main/resources/org/jboss/arquillian/protocol/servlet_2_5/web.xml	2010-07-08 10:47:56 UTC (rev 4696)
@@ -3,7 +3,7 @@
     <display-name>Arquillian</display-name>
     <servlet>
         <servlet-name>ServletTestRunner</servlet-name>
-        <servlet-class>org.jboss.arquillian.protocol.servlet.ServletTestRunner</servlet-class>
+        <servlet-class>org.jboss.arquillian.protocol.servlet_2_5.ServletTestRunner</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>ServletTestRunner</servlet-name>