aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/launcher
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-04 16:48:13 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-05 11:39:35 +0300
commitc71563c8a6e9993cbbdff3ddfdfccfee4aa34f7b (patch)
tree8f35fb183d97efa07dfca8dcbc6f4b126e973d43 /uitest/src/com/vaadin/launcher
parent437e700dfc4173da66d45abd95b6f661d7216218 (diff)
downloadvaadin-framework-c71563c8a6e9993cbbdff3ddfdfccfee4aa34f7b.tar.gz
vaadin-framework-c71563c8a6e9993cbbdff3ddfdfccfee4aa34f7b.zip
Extract ApplicationConfiguration from DeploymentConfiguration (#9382)
Diffstat (limited to 'uitest/src/com/vaadin/launcher')
-rw-r--r--uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index 11685033a9..3d63c7dfb9 100644
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -21,7 +21,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.LinkedHashSet;
-import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -32,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import com.vaadin.Application;
import com.vaadin.server.AbstractUIProvider;
+import com.vaadin.server.ApplicationConfiguration;
import com.vaadin.server.VaadinServlet;
import com.vaadin.server.WrappedHttpServletRequest;
import com.vaadin.server.WrappedRequest;
@@ -259,8 +259,9 @@ public class ApplicationRunnerServlet extends VaadinServlet {
@Override
protected ServletDeploymentConfiguration createDeploymentConfiguration(
- Properties applicationProperties) {
- return new ServletDeploymentConfiguration(this, applicationProperties) {
+ ApplicationConfiguration applicationConfiguration) {
+ return new ServletDeploymentConfiguration(this,
+ applicationConfiguration) {
@Override
public String getStaticFileLocation(WrappedRequest request) {
URIS uris = getApplicationRunnerURIs(WrappedHttpServletRequest