From c71563c8a6e9993cbbdff3ddfdfccfee4aa34f7b Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 4 Sep 2012 16:48:13 +0300
Subject: Extract ApplicationConfiguration from DeploymentConfiguration (#9382)

---
 uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'uitest/src/com/vaadin/launcher')

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
-- 
cgit v1.2.3