Fix JBoss 6 integration tests

6 files changed, 42 insertions, 196 deletions

diff --git a/test/servlet-containers/generic/build.xml b/test/servlet-containers/generic/build.xml
index ee16b2c0e1..da6731ea0d 100644
--- a/test/servlet-containers/generic/build.xml
+++ b/test/servlet-containers/generic/build.xml
@@ -13,6 +13,9 @@
     <property name="result.dir" value="result" />
     <property name="result.war"
         location="${uitest.dir}/target/${module.name}-${vaadin.version}.war" />
+    <!--todo automate version number -->
+    <property name="result.jboss6.war"
+        location="${uitest.dir}/target/${module.name}-8.0-SNAPSHOT-jboss6.war" />
 
     <!-- Need to give a default value to keep Ivy happy -->
     <property name="vaadin.build.repository" value="http://maven.vaadin.com/vaadin-prereleases"/>
@@ -23,12 +26,12 @@
     </target>
 
     <target name="test-server" depends="clean-testbench-errors">
-        <property name="war.file" location="${result.war}" />
         <mkdir dir="${vaadin.basedir}/result" />
         <ant antfile="integration_tests.xml"
             target="integration-test-all" inheritall="false"
             inheritrefs="false">
-            <property name="demo.war" value="${war.file}" />
+            <property name="demo.war" value="${result.war}" />
+            <property name="demo.jboss6.war" value="${result.jboss6.war}" />
         </ant>
     </target>
 
diff --git a/test/servlet-containers/generic/integration_tests.xml b/test/servlet-containers/generic/integration_tests.xml
index a46670b6a3..c10af3042b 100644
--- a/test/servlet-containers/generic/integration_tests.xml
+++ b/test/servlet-containers/generic/integration_tests.xml
@@ -121,6 +121,7 @@
         <antcall target="run-generic-integration-test">
             <param name="startDelay" value="10" />
             <param name="target-server" value="jbosseap6" />
+            <param name="demo.war" value="${demo.jboss6.war}"/>
         </antcall>
     </target>
     <target name="integration-test-wildfly8">
diff --git a/test/servlet-containers/generic/pom.xml b/test/servlet-containers/generic/pom.xml
index 545ef8b52e..8ff752483c 100644
--- a/test/servlet-containers/generic/pom.xml
+++ b/test/servlet-containers/generic/pom.xml
@@ -14,37 +14,26 @@
 
     <dependencies>
 
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>com.vaadin</groupId>
             <artifactId>vaadin-compatibility-server</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>com.vaadin</groupId>
             <artifactId>vaadin-compatibility-client-compiled</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-client-compiled</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-themes</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-push</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-push</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client-compiled</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>com.vaadin</groupId>
             <artifactId>vaadin-uitest-common</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
@@ -57,7 +46,9 @@
         <plugins>
             <!--TODO run this on different servers-->
             <plugin>
-                <artifactId>maven-install-plugin</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty.version}</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
@@ -75,24 +66,25 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <configuration>
-                    <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
+                <artifactId>maven-war-plugin</artifactId>
+                <!-- This execution builds an additional .war file with JBoss 6 specific descriptor -->
+                <executions>
+                    <execution>
+                        <id>jboss6-war</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>war</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>jboss6</classifier>
+                            <webResources>
+                                <resource>
+                                    <directory>src/main/jboss-6</directory>
+                                </resource>
+                            </webResources>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/test/servlet-containers/generic/src/main/jboss-6/WEB-INF/jboss-web.xml b/test/servlet-containers/generic/src/main/jboss-6/WEB-INF/jboss-web.xml
new file mode 100644
index 0000000000..bfa4bac003
--- /dev/null
+++ b/test/servlet-containers/generic/src/main/jboss-6/WEB-INF/jboss-web.xml
@@ -0,0 +1,7 @@
+<jboss-web version="7.2" xmlns="http://www.jboss.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+         schema/jboss-web_7_2.xsd">
+    <!-- Enable websockets on JBoss EAP 6.4 -->
+    <enable-websockets>true</enable-websockets>
+</jboss-web>
diff --git a/uitest/src/main/webapp/WEB-INF/web.xml b/uitest/src/main/webapp/WEB-INF/web.xml
index 4f7ed062a8..5a1e3357da 100644
--- a/uitest/src/main/webapp/WEB-INF/web.xml
+++ b/uitest/src/main/webapp/WEB-INF/web.xml
@@ -87,16 +87,6 @@
     </servlet>
 
     <servlet>
-        <servlet-name>VaadinApplicationRunnerWithJSR356</servlet-name>
-        <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
-        <!-- Force web sockets to use JSR 356 standard -->
-        <init-param>
-            <param-name>org.atmosphere.cpr.asyncSupport</param-name>
-            <param-value>org.atmosphere.container.JSR356AsyncSupport</param-value>
-        </init-param>
-        <async-supported>true</async-supported>
-    </servlet>
-    <servlet>
         <servlet-name>CommErrorEmulator</servlet-name>
         <servlet-class>com.vaadin.tests.application.CommErrorEmulatorServlet</servlet-class>
         <init-param>
@@ -156,17 +146,6 @@
         <async-supported>true</async-supported>
     </servlet>
 
-    <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet -->
-    <servlet>
-        <servlet-name>IntegrationTest</servlet-name>
-        <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
-        <init-param>
-            <param-name>UI</param-name>
-            <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value>
-        </init-param>
-        <async-supported>true</async-supported>
-    </servlet>
-
     <servlet-mapping>
         <servlet-name>Embed App 1</servlet-name>
         <url-pattern>/embed1/*</url-pattern>
@@ -206,11 +185,6 @@
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>VaadinApplicationRunnerWithJSR356</servlet-name>
-        <url-pattern>/run-jsr356/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
         <servlet-name>CommErrorEmulator</servlet-name>
         <url-pattern>/commerror/*</url-pattern>
     </servlet-mapping>
diff --git a/uitest/src/main/webapp/WEB-INF/web.xml.2.4 b/uitest/src/main/webapp/WEB-INF/web.xml.2.4
deleted file mode 100644
index 96144b8036..0000000000
--- a/uitest/src/main/webapp/WEB-INF/web.xml.2.4
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="vaadin-uitest" version="2.4"
-	xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<!-- THIS IS A DEVELOPMENT AND TESTING web.xml for servlet 2.4 -->
-
-	<display-name>Vaadin</display-name>
-	<description>Vaadin examples</description>
-
-	<context-param>
-		<param-name>productionMode</param-name>
-		<param-value>false</param-value>
-	</context-param>
-
-	<context-param>
-		<param-name>resourceCacheTime</param-name>
-		<param-value>3600</param-value>
-	</context-param>
-	<servlet>
-		<servlet-name>Embed App 1</servlet-name>
-		<servlet-class>com.vaadin.server.LegacyVaadinServlet</servlet-class>
-		<init-param>
-			<param-name>application</param-name>
-			<param-value>com.vaadin.tests.components.button.Buttons</param-value>
-		</init-param>
-	</servlet>
-	<servlet>
-		<servlet-name>Embed App 2</servlet-name>
-		<servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
-		<init-param>
-			<param-name>UI</param-name>
-			<param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value>
-		</init-param>
-	</servlet>
-	<servlet>
-		<servlet-name>UI provider app</servlet-name>
-		<servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
-		<init-param>
-			<param-name>UIProvider</param-name>
-			<param-value>com.vaadin.tests.applicationservlet.InitParamUIProvider</param-value>
-		</init-param>
-		<init-param>
-			<param-name>UI</param-name>
-			<param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet>
-		<servlet-name>VaadinApplicationRunner</servlet-name>
-		<servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
-		<!-- Non-default values for testing purposes -->
-		<init-param>
-			<param-name>legacyPropertyToString</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<init-param>
-			<param-name>heartbeatInterval</param-name>
-			<param-value>301</param-value>
-		</init-param>
-		<init-param>
-			<param-name>resourceCacheTime</param-name>
-			<param-value>3601</param-value>
-		</init-param>
-		<init-param>
-			<param-name>closeIdleSessions</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<init-param>
-			<param-name>testParam</param-name>
-			<param-value>42</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet>
-		<servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
-		<servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
-		<init-param>
-			<param-name>pushmode</param-name>
-			<param-value>automatic</param-value>
-		</init-param>
-	</servlet>
-
-	<!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet -->
-	<servlet>
-		<servlet-name>IntegrationTest</servlet-name>
-		<servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
-		<init-param>
-			<param-name>UI</param-name>
-			<param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>Embed App 1</servlet-name>
-		<url-pattern>/embed1/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>Embed App 2</servlet-name>
-		<url-pattern>/embed2/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>UI provider app</servlet-name>
-		<url-pattern>/uiprovider/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>VaadinApplicationRunner</servlet-name>
-		<url-pattern>/run/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
-		<url-pattern>/run-push/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>IntegrationTest</servlet-name>
-		<url-pattern>/integration/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>IntegrationTest</servlet-name>
-		<url-pattern>/VAADIN/*</url-pattern>
-	</servlet-mapping>
-
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-
-</web-app>