From 6b8412033e680ce6e5c7827ac504adf132305726 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Fri, 15 Apr 2016 11:06:18 +0300
Subject: Build uitest war with maven

Change-Id: I32625901ca27a282253df44c6e776cf9632bacda
---
 WebContent/WEB-INF/jboss-web.xml       |   7 -
 WebContent/WEB-INF/liferay-display.xml |   9 --
 WebContent/WEB-INF/liferay-portlet.xml |  33 -----
 WebContent/WEB-INF/portlet.xml         |  79 ------------
 WebContent/WEB-INF/web.xml             | 228 ---------------------------------
 WebContent/WEB-INF/web.xml.2.4         | 131 -------------------
 6 files changed, 487 deletions(-)
 delete mode 100644 WebContent/WEB-INF/jboss-web.xml
 delete mode 100644 WebContent/WEB-INF/liferay-display.xml
 delete mode 100644 WebContent/WEB-INF/liferay-portlet.xml
 delete mode 100644 WebContent/WEB-INF/portlet.xml
 delete mode 100644 WebContent/WEB-INF/web.xml
 delete mode 100644 WebContent/WEB-INF/web.xml.2.4

(limited to 'WebContent/WEB-INF')

diff --git a/WebContent/WEB-INF/jboss-web.xml b/WebContent/WEB-INF/jboss-web.xml
deleted file mode 100644
index 12548b7c5c..0000000000
--- a/WebContent/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<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/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
deleted file mode 100644
index 014ed31b47..0000000000
--- a/WebContent/WEB-INF/liferay-display.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE display PUBLIC "-//Liferay//DTD Display 4.0.0//EN" "http://www.liferay.com/dtd/liferay-display_4_0_0.dtd">
-
-<display>
-    <category name="Vaadin">
-        <portlet id="JSR286TestPortlet" />
-        <portlet id="Vaadin Liferay Theme Portlet" />
-    </category>
-</display>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml
deleted file mode 100644
index ea060ce44a..0000000000
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 4.3.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_4_3_0.dtd">
-
-<liferay-portlet-app>
-    <portlet>
-        <portlet-name>JSR286TestPortlet</portlet-name>
-        <instanceable>false</instanceable>
-        <ajaxable>false</ajaxable>
-    </portlet>
-    <portlet>
-        <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
-        <instanceable>false</instanceable>
-        <ajaxable>false</ajaxable>
-    </portlet>
-
-    <role-mapper>
-        <role-name>administrator</role-name>
-        <role-link>Administrator</role-link>
-    </role-mapper>
-    <role-mapper>
-        <role-name>guest</role-name>
-        <role-link>Guest</role-link>
-    </role-mapper>
-    <role-mapper>
-        <role-name>power-user</role-name>
-        <role-link>Power User</role-link>
-    </role-mapper>
-    <role-mapper>
-        <role-name>user</role-name>
-        <role-link>User</role-link>
-    </role-mapper>
-
-</liferay-portlet-app>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
deleted file mode 100644
index 3a603c43ae..0000000000
--- a/WebContent/WEB-INF/portlet.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-    version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
-
-    <portlet>
-        <portlet-name>JSR286TestPortlet</portlet-name>
-        <display-name>Vaadin Portlet 2.0 Test</display-name>
-        <portlet-class>com.vaadin.server.VaadinPortlet</portlet-class>
-        <init-param>
-            <name>ui</name>
-            <value>com.vaadin.tests.integration.JSR286Portlet</value>
-        </init-param>
-        <init-param>
-            <name>widgetset</name>
-            <value>com.vaadin.DefaultWidgetSet</value>
-        </init-param>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>view</portlet-mode>
-            <portlet-mode>edit</portlet-mode>
-            <portlet-mode>help</portlet-mode>
-        </supports>
-        <portlet-info>
-            <title>Vaadin Portlet 2.0 Test</title>
-            <short-title>Vaadin Portlet 2.0 Test</short-title>
-        </portlet-info>
-
-        <security-role-ref>
-            <role-name>administrator</role-name>
-        </security-role-ref>
-        <security-role-ref>
-            <role-name>guest</role-name>
-        </security-role-ref>
-        <security-role-ref>
-            <role-name>power-user</role-name>
-        </security-role-ref>
-        <security-role-ref>
-            <role-name>user</role-name>
-        </security-role-ref>
-    </portlet>
-
-    <portlet>
-        <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
-        <display-name>Vaadin Liferay Theme</display-name>
-
-        <portlet-class>com.vaadin.server.LegacyVaadinPortlet</portlet-class>
-        <init-param>
-            <name>application</name>
-            <value>com.vaadin.tests.integration.LiferayThemeDemo</value>
-        </init-param>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>view</portlet-mode>
-        </supports>
-
-        <portlet-info>
-            <title>Vaadin Liferay Theme</title>
-            <short-title>Vaadin Liferay Theme</short-title>
-        </portlet-info>
-
-        <security-role-ref>
-            <role-name>administrator</role-name>
-        </security-role-ref>
-        <security-role-ref>
-            <role-name>guest</role-name>
-        </security-role-ref>
-        <security-role-ref>
-            <role-name>power-user</role-name>
-        </security-role-ref>
-        <security-role-ref>
-            <role-name>user</role-name>
-        </security-role-ref>
-    </portlet>
-
-    <!-- This can be used to work around an issue in liferay 5.0-5.1.1 <container-runtime-option> 
-        <name>javax.portlet.escapeXml</name> <value>false</value> </container-runtime-option> -->
-</portlet-app>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 0def4001b8..0000000000
--- a/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="vaadin-uitest" version="3.0"
-    xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
-    <!-- THIS IS A DEVELOPMENT AND TESTING web.xml . -->
-
-    <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>
-        <async-supported>true</async-supported>
-    </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>
-        <async-supported>true</async-supported>
-    </servlet>
-    <servlet>
-        <servlet-name>GwtRpcTest</servlet-name>
-        <servlet-class>com.vaadin.tests.widgetset.server.gwtrpc.GwtRpcServletTest</servlet-class>
-    </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>
-        <async-supported>true</async-supported>
-    </servlet>
-
-    <servlet>
-        <servlet-name>VaadinStaticFiles</servlet-name>
-        <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
-        <async-supported>false</async-supported>
-    </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>
-        <async-supported>true</async-supported>
-    </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>
-            <param-name>heartbeatInterval</param-name>
-            <param-value>10</param-value>
-        </init-param>
-        <init-param>
-            <param-name>ui</param-name>
-            <param-value>com.vaadin.tests.application.CommErrorEmulatorUI</param-value>
-        </init-param>
-        <async-supported>true</async-supported>
-    </servlet>
-    <servlet>
-        <servlet-name>RPCLogger</servlet-name>
-        <servlet-class>com.vaadin.tests.rpclogger.RPCLoggerServlet</servlet-class>
-        <init-param>
-            <param-name>ui</param-name>
-            <param-value>com.vaadin.tests.rpclogger.RPCLoggerUI</param-value>
-        </init-param>
-        <async-supported>true</async-supported>
-    </servlet>
-
-    <servlet>
-        <!-- This servlet is a separate instance for the sole purpose of 
-            testing #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) 
-            because it modifies the VaadinService timeout parameters -->
-        <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name>
-        <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
-    </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>
-        <async-supported>true</async-supported>
-    </servlet>
-
-    <servlet>
-        <servlet-name>VaadinApplicationRunnerWithPushTimeout</servlet-name>
-        <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
-        <init-param>
-            <param-name>pushLongPollingSuspendTimeout</param-name>
-            <param-value>10000</param-value>
-        </init-param>
-        <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>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Embed App 2</servlet-name>
-        <url-pattern>/embed2/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>GwtRpcTest</servlet-name>
-        <url-pattern>/VAADIN/widgetsets/com.vaadin.tests.widgetset.TestingWidgetSet/GwtRpcTest/*</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>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name>
-        <url-pattern>/12446/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
-        <url-pattern>/run-push/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>VaadinApplicationRunnerWithPushTimeout</servlet-name>
-        <url-pattern>/run-push-timeout/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>VaadinApplicationRunnerWithJSR356</servlet-name>
-        <url-pattern>/run-jsr356/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>IntegrationTest</servlet-name>
-        <url-pattern>/integration/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>CommErrorEmulator</servlet-name>
-        <url-pattern>/commerror/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>RPCLogger</servlet-name>
-        <url-pattern>/rpclogger/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>VaadinStaticFiles</servlet-name>
-        <url-pattern>/VAADIN/*</url-pattern>
-    </servlet-mapping>
-
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/WebContent/WEB-INF/web.xml.2.4 b/WebContent/WEB-INF/web.xml.2.4
deleted file mode 100644
index 96144b8036..0000000000
--- a/WebContent/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>
-- 
cgit v1.2.3