Rename DeploymentConfiguration -> VaadinService (#9402)

3 files changed, 10 insertions, 11 deletions

diff --git a/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java
index d393f1c9b2..1e663afdd2 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java
@@ -1,6 +1,5 @@
 package com.vaadin.data.util;
 
-
 /**
  * Automated test for {@link AbstractBeanContainer}.
  * 
diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index 2aa8d04364..e6d84a2b83 100644
--- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import junit.framework.TestCase;
 
 import com.vaadin.DefaultApplicationConfiguration;
-import com.vaadin.server.VaadinServlet.ServletDeploymentConfiguration;
+import com.vaadin.server.VaadinServlet.ServletService;
 
 public class TestAbstractApplicationServletStaticFilesLocation extends TestCase {
 
@@ -32,7 +32,7 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase
         Field f = VaadinServlet.class
                 .getDeclaredField("deploymentConfiguration");
         f.setAccessible(true);
-        f.set(servlet, new ServletDeploymentConfiguration(servlet,
+        f.set(servlet, new ServletService(servlet,
                 new DefaultApplicationConfiguration(servlet.getClass(),
                         new Properties())));
 
@@ -80,8 +80,8 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase
         // Set request into replay mode
         replay(request);
 
-        String location = servlet.getDeploymentConfiguration()
-                .getStaticFileLocation(servlet.createWrappedRequest(request));
+        String location = servlet.getVaadinService().getStaticFileLocation(
+                servlet.createWrappedRequest(request));
         return location;
     }
 
@@ -93,8 +93,8 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase
         // Set request into replay mode
         replay(request);
 
-        String location = servlet.getDeploymentConfiguration()
-                .getStaticFileLocation(servlet.createWrappedRequest(request));
+        String location = servlet.getVaadinService().getStaticFileLocation(
+                servlet.createWrappedRequest(request));
         return location;
     }
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
index c41183daf3..2b4676bc42 100644
--- a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
+++ b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
@@ -11,7 +11,7 @@ import org.easymock.EasyMock;
 import com.vaadin.DefaultApplicationConfiguration;
 import com.vaadin.server.ApplicationConfiguration;
 import com.vaadin.server.DefaultUIProvider;
-import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.server.VaadinSession.ApplicationStartEvent;
 import com.vaadin.server.WrappedRequest;
@@ -73,14 +73,14 @@ public class CustomUIClassLoader extends TestCase {
 
     private static WrappedRequest createRequestMock(ClassLoader classloader) {
         // Mock a DeploymentConfiguration to give the passed classloader
-        DeploymentConfiguration configurationMock = EasyMock
-                .createMock(DeploymentConfiguration.class);
+        VaadinService configurationMock = EasyMock
+                .createMock(VaadinService.class);
         EasyMock.expect(configurationMock.getClassLoader()).andReturn(
                 classloader);
 
         // Mock a WrappedRequest to give the mocked deployment configuration
         WrappedRequest requestMock = EasyMock.createMock(WrappedRequest.class);
-        EasyMock.expect(requestMock.getDeploymentConfiguration()).andReturn(
+        EasyMock.expect(requestMock.getVaadinService()).andReturn(
                 configurationMock);
 
         EasyMock.replay(configurationMock, requestMock);