summaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-03 13:57:20 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-03 14:05:31 +0300
commit6f276f4451cb185919084181b54fb84532a1d984 (patch)
tree698b9459b867349aae9de5f26ebefa7dd1f3b81d /uitest/src
parent3dd5a4824cda3dd7842c937a618feebc2b1a0f27 (diff)
downloadvaadin-framework-6f276f4451cb185919084181b54fb84532a1d984.tar.gz
vaadin-framework-6f276f4451cb185919084181b54fb84532a1d984.zip
Combine ApplicationServlet and AAS and rename to VaadinServlet (#9460)
Diffstat (limited to 'uitest/src')
-rw-r--r--uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index e2fe5df4c7..bbe6e061fb 100644
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.vaadin.Application;
-import com.vaadin.server.AbstractApplicationServlet;
+import com.vaadin.server.VaadinServlet;
import com.vaadin.server.AbstractUIProvider;
import com.vaadin.server.WrappedHttpServletRequest;
import com.vaadin.server.WrappedRequest;
@@ -38,7 +38,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.UI;
@SuppressWarnings("serial")
-public class ApplicationRunnerServlet extends AbstractApplicationServlet {
+public class ApplicationRunnerServlet extends VaadinServlet {
/**
* The name of the application class currently used. Only valid within one