Rename DeploymentConfiguration -> VaadinService (#9402)

4 files changed, 7 insertions, 11 deletions

diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index 675fa4e319..230a7b9230 100644
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -61,8 +61,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
             Collections.addAll(defaultPackages, initParameter.split(","));
         }
         String str = TestBase.class.getName().replace('.', '/') + ".class";
-        URL url = getDeploymentConfiguration().getClassLoader()
-                .getResource(str);
+        URL url = getVaadinService().getClassLoader().getResource(str);
         if ("file".equals(url.getProtocol())) {
             File comVaadinTests = new File(url.getPath()).getParentFile()
                     .getParentFile();
@@ -270,10 +269,9 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
     }
 
     @Override
-    protected ServletDeploymentConfiguration createDeploymentConfiguration(
+    protected ServletService createServletService(
             ApplicationConfiguration applicationConfiguration) {
-        return new ServletDeploymentConfiguration(this,
-                applicationConfiguration) {
+        return new ServletService(this, applicationConfiguration) {
             @Override
             public String getStaticFileLocation(WrappedRequest request) {
                 URIS uris = getApplicationRunnerURIs(WrappedHttpServletRequest
@@ -291,8 +289,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
     @Override
     protected WrappedHttpServletRequest createWrappedRequest(
             HttpServletRequest request) {
-        return new WrappedHttpServletRequest(request,
-                getDeploymentConfiguration()) {
+        return new WrappedHttpServletRequest(request, getVaadinService()) {
             @Override
             public String getRequestPathInfo() {
                 return ApplicationRunnerServlet.this.getRequestPathInfo(this);
diff --git a/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java b/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
index 45552df39c..c102291b50 100644
--- a/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
+++ b/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
@@ -27,7 +27,7 @@ public class NonExistingFileResource extends TestBase {
             @Override
             public void buttonClick(ClickEvent event) {
                 FileResource res = new FileResource(new File(CurrentInstance
-                        .get(WrappedRequest.class).getDeploymentConfiguration()
+                        .get(WrappedRequest.class).getVaadinService()
                         .getBaseDirectory()
                         + "/" + filename));
                 getMainWindow().open(res);
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
index 93ecf4b6eb..e2804e9c3c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
@@ -48,8 +48,7 @@ public class Ticket1975 extends Application {
 
                     }));
             File baseDir = CurrentInstance.get(WrappedRequest.class)
-                    .getDeploymentConfiguration().getBaseDirectory()
-                    .getAbsoluteFile();
+                    .getVaadinService().getBaseDirectory().getAbsoluteFile();
             File f = new File(baseDir + "/VAADIN/themes/" + getTheme()
                     + "/layouts/Ticket1975.html");
 
diff --git a/uitest/src/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/com/vaadin/tests/util/SampleDirectory.java
index be98de67cc..609606b501 100644
--- a/uitest/src/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/com/vaadin/tests/util/SampleDirectory.java
@@ -49,7 +49,7 @@ public class SampleDirectory {
                 + "possible security constraint with Application "
                 + "Server or Servlet Container.<br />";
         File file = CurrentInstance.get(WrappedRequest.class)
-                .getDeploymentConfiguration().getBaseDirectory();
+                .getVaadinService().getBaseDirectory();
         if ((file == null) || (!file.canRead())
                 || (file.getAbsolutePath() == null)) {
             // cannot access example directory, possible security issue with