summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/servlet-containers/generic/pom.xml42
-rw-r--r--test/servlet-containers/generic/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java19
-rw-r--r--test/servlet-containers/generic/src/main/java/com/vaadin/tests/JSR356Servlet.java18
-rw-r--r--test/servlet-containers/generic/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java14
4 files changed, 72 insertions, 21 deletions
diff --git a/test/servlet-containers/generic/pom.xml b/test/servlet-containers/generic/pom.xml
index 8ff752483c..4c1c9b8292 100644
--- a/test/servlet-containers/generic/pom.xml
+++ b/test/servlet-containers/generic/pom.xml
@@ -11,6 +11,9 @@
<artifactId>vaadin-test-generic-integration</artifactId>
<name>vaadin-test-generic-integration</name>
<packaging>war</packaging>
+ <properties>
+ <osgi.bundle.version>8.0.0</osgi.bundle.version>
+ </properties>
<dependencies>
@@ -26,7 +29,7 @@
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
- <artifactId>vaadin-push</artifactId>
+ <artifactId>vaadin-compatibility-themes</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
@@ -34,6 +37,10 @@
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
+ <artifactId>vaadin-push</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin</groupId>
<artifactId>vaadin-uitest-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -67,6 +74,11 @@
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
<!-- This execution builds an additional .war file with JBoss 6 specific descriptor -->
<executions>
<execution>
@@ -86,7 +98,33 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
+ <Import-Package>javax.servlet,javax.servlet.http,javax.websocket,javax.websocket.server,!com.vaadin.*,*</Import-Package>
+ <Web-ContextPath>run</Web-ContextPath>
+ </instructions>
+ <supportedProjectTypes>
+ <supportedProjectType>war</supportedProjectType>
+ </supportedProjectTypes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>osgi-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
</project>
diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java b/test/servlet-containers/generic/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java
index ce64c22577..6f265b10f7 100644
--- a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java
+++ b/test/servlet-containers/generic/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java
@@ -1,14 +1,7 @@
package com.vaadin.tests;
-import javax.servlet.annotation.WebInitParam;
-import javax.servlet.annotation.WebServlet;
-
-import com.vaadin.annotations.VaadinServletConfiguration;
import com.vaadin.server.UIClassSelectionEvent;
import com.vaadin.server.UIProvider;
-import com.vaadin.server.VaadinServlet;
-import com.vaadin.tests.integration.ServletIntegrationUI;
-import com.vaadin.tests.integration.ServletIntegrationWebsocketUI;
import com.vaadin.tests.integration.push.BasicPush;
import com.vaadin.ui.UI;
@@ -62,16 +55,4 @@ public class IntegrationTestUIProvider extends UIProvider {
}
}
- @WebServlet(urlPatterns = "/*", name = "IntegrationTestUIProvider", asyncSupported = true, initParams = {
- @WebInitParam(name = "UIProvider", value = "com.vaadin.tests.IntegrationTestUIProvider") })
- @VaadinServletConfiguration(ui = ServletIntegrationUI.class, productionMode = false)
- public static class MyServlet extends VaadinServlet {
- }
-
- @WebServlet(urlPatterns = "/run-jsr356/*", name = "IntegrationUIProvider-Jsr356", asyncSupported = false, initParams = {
- @WebInitParam(name = "org.atmosphere.cpr.asyncSupport", value = "org.atmosphere.container.JSR356AsyncSupport") })
- @VaadinServletConfiguration(ui = ServletIntegrationWebsocketUI.class, productionMode = false)
- public static class JSR356Servlet extends VaadinServlet {
-
- }
}
diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/JSR356Servlet.java b/test/servlet-containers/generic/src/main/java/com/vaadin/tests/JSR356Servlet.java
new file mode 100644
index 0000000000..1a6c138f36
--- /dev/null
+++ b/test/servlet-containers/generic/src/main/java/com/vaadin/tests/JSR356Servlet.java
@@ -0,0 +1,18 @@
+package com.vaadin.tests;
+
+import com.vaadin.annotations.VaadinServletConfiguration;
+import com.vaadin.server.VaadinServlet;
+import com.vaadin.tests.integration.ServletIntegrationWebsocketUI;
+
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+/**
+ * Created by elmot on 06-02-2017.
+ */
+@WebServlet(urlPatterns = "/run-jsr356/*", name = "IntegrationUIProvider-Jsr356", asyncSupported = false, initParams = {
+ @WebInitParam(name = "org.atmosphere.cpr.asyncSupport", value = "org.atmosphere.container.JSR356AsyncSupport")})
+@VaadinServletConfiguration(ui = ServletIntegrationWebsocketUI.class, productionMode = false)
+public class JSR356Servlet extends VaadinServlet {
+
+}
diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java b/test/servlet-containers/generic/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java
new file mode 100644
index 0000000000..9ca79b31a8
--- /dev/null
+++ b/test/servlet-containers/generic/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java
@@ -0,0 +1,14 @@
+package com.vaadin.tests;
+
+import com.vaadin.annotations.VaadinServletConfiguration;
+import com.vaadin.server.VaadinServlet;
+import com.vaadin.tests.integration.ServletIntegrationUI;
+
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(urlPatterns = "/*" ,name = "IntegrationTestUIProvider", asyncSupported = true, initParams = {
+ @WebInitParam(name = "UIProvider", value = "com.vaadin.tests.IntegrationTestUIProvider")})
+@VaadinServletConfiguration(ui = ServletIntegrationUI.class, productionMode = false)
+public class ServerIntegrationTestServlet extends VaadinServlet {
+}