diff options
| author | Artur Signell <artur@vaadin.com> | 2012-04-04 16:15:01 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-04-05 00:09:30 +0300 |
| commit | 2c683e387292aff6c2a70cba003f970d28c40d31 (patch) | |
| tree | 15c22e950fd7a42fc6b27c73067d9fb07f84ca89 | |
| parent | 2e1a485d45ea7e48f67d2ff0c326c33ddf401e9b (diff) | |
| download | vaadin-framework-2c683e387292aff6c2a70cba003f970d28c40d31.tar.gz vaadin-framework-2c683e387292aff6c2a70cba003f970d28c40d31.zip | |
Include ApplicationRunnerServlet in test.war
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 6 | ||||
| -rw-r--r-- | tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java | 1 | ||||
| -rw-r--r-- | tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java (renamed from tests/testbench/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java) | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 73d9951d21..5b250d86f2 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -22,11 +22,7 @@ <servlet> <servlet-name>VaadinApplicationRunner</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class> - <init-param> - <param-name>defaultPackages</param-name> - <param-value>com.vaadin.tests,com.vaadin.tests.tickets,com.vaadin.tests.components,com.vaadin.tests.components.layouts,com.vaadin.tests.components.panel,com.vaadin.tests.components.combobox,com.vaadin.tests.components.popupview,com.vaadin.tests.components.datefield,com.vaadin.tests.components.richtextarea,com.vaadin.tests.components.absolutelayout,com.vaadin.tests.components.embedded,com.vaadin.tests.components.splitpanel,com.vaadin.tests.components.abstractfield,com.vaadin.tests.components.form,com.vaadin.tests.components.table,com.vaadin.tests.components.accordion,com.vaadin.tests.components.label,com.vaadin.tests.components.tabsheet,com.vaadin.tests.components.beanitemcontainer,com.vaadin.tests.components.link,com.vaadin.tests.components.textfield,com.vaadin.tests.components.button,com.vaadin.tests.components.optiongroup,com.vaadin.tests.components.tree,com.vaadin.tests.components.caption,com.vaadin.tests.components.orderedlayout,com.vaadin.tests.components.window,com.vaadin.tests.dd,com.vaadin.tests.validation</param-value> - </init-param> + <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> </servlet> <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet --> diff --git a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java b/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java index 486b1ba0c1..44a6a3b66d 100644 --- a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java +++ b/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java @@ -47,7 +47,6 @@ public class TestClassesSerializable extends TestCase { // class level filtering, also affecting nested classes and // interfaces "com\\.vaadin\\.terminal\\.gwt\\.server\\.AbstractCommunicationManager.*", // - "com\\.vaadin\\.terminal\\.gwt\\.server\\.ApplicationRunnerServlet.*", // "com\\.vaadin\\.terminal\\.gwt\\.server\\.CommunicationManager.*", // "com\\.vaadin\\.terminal\\.gwt\\.server\\.PortletCommunicationManager.*", // }; diff --git a/tests/testbench/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java index 69e8367a0c..33d63b0413 100644 --- a/tests/testbench/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java +++ b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -1,7 +1,7 @@ /* @VaadinApache2LicenseForJavaFiles@ */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.launcher; import java.io.File; import java.io.IOException; @@ -20,6 +20,8 @@ import javax.servlet.http.HttpServletResponse; import com.vaadin.Application; import com.vaadin.terminal.WrappedRequest; +import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; +import com.vaadin.terminal.gwt.server.WrappedHttpServletRequest; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Root; |