Fix some stray references to the name deployment configuration (#9402)

diff --git a/server/src/com/vaadin/server/AddonContext.java b/server/src/com/vaadin/server/AddonContext.java
index 2cf9b23c756a1fe7a69f7c8e335910d6b45e510e..606d3c3568f2faacb4cbf1f071b2fe80f61f54e0 100644 (file)
--- a/server/src/com/vaadin/server/AddonContext.java
+++ b/server/src/com/vaadin/server/AddonContext.java
@@ -55,8 +55,8 @@ public class AddonContext {
     private List<AddonContextListener> initedListeners = new ArrayList<AddonContextListener>();
 
     /**
-     * Creates a new context using a given deployment configuration. Only the
-     * framework itself should typically create AddonContext methods.
+     * Creates a new context using a given vaadin service. Only the framework
+     * itself should typically create AddonContext instances.
      * 
      * @param vaadinService
      *            the vaadin service for the associated servlet or portlet.
@@ -67,9 +67,9 @@ public class AddonContext {
     }
 
     /**
-     * Gets the deployment configuration for this context.
+     * Gets the vaadin service for this context.
      * 
-     * @return the deployment configuration
+     * @return the vaadin service
      */
     public VaadinService getVaadinService() {
         return vaadinService;

diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index cd62e292fbe7914fb48ec0b4a08d5fa9b114cfc8..ce436205d82ff4ccbcd040be3fbfb3fa47687eee 100644 (file)
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -409,9 +409,9 @@ public class VaadinServlet extends HttpServlet implements Constants {
     }
 
     /**
-     * Gets a the deployment configuration for this servlet.
+     * Gets a the vaadin service for this servlet.
      * 
-     * @return the deployment configuration
+     * @return the vaadin service
      */
     protected ServletService getVaadinService() {
         return servletService;

diff --git a/server/src/com/vaadin/server/WrappedHttpServletRequest.java b/server/src/com/vaadin/server/WrappedHttpServletRequest.java
index 7b458dd3d447ac974b497c03e83714e0981e1f81..87c6c521afd6f0dabb2d804435e2ad1e9402d74a 100644 (file)
--- a/server/src/com/vaadin/server/WrappedHttpServletRequest.java
+++ b/server/src/com/vaadin/server/WrappedHttpServletRequest.java
@@ -36,8 +36,7 @@ public class WrappedHttpServletRequest extends HttpServletRequestWrapper
     private final ServletService vaadinService;
 
     /**
-     * Wraps a http servlet request and associates with a deployment
-     * configuration
+     * Wraps a http servlet request and associates with a vaadin service
      * 
      * @param request
      *            the http servlet request to wrap

diff --git a/server/src/com/vaadin/server/WrappedHttpServletResponse.java b/server/src/com/vaadin/server/WrappedHttpServletResponse.java
index 5fbfa451d8372a6c81b1d2310b36cf83cb6e42de..74a580f874f6259fef96008db7488f8077ec2531 100644 (file)
--- a/server/src/com/vaadin/server/WrappedHttpServletResponse.java
+++ b/server/src/com/vaadin/server/WrappedHttpServletResponse.java
@@ -36,7 +36,7 @@ public class WrappedHttpServletResponse extends HttpServletResponseWrapper
     private ServletService vaadinService;
 
     /**
-     * Wraps a http servlet response and an associated deployment configuration
+     * Wraps a http servlet response and an associated vaadin service
      * 
      * @param response
      *            the http servlet response to wrap

diff --git a/server/src/com/vaadin/server/WrappedPortletRequest.java b/server/src/com/vaadin/server/WrappedPortletRequest.java
index bea002181b685abcb64e394945af3a785af2fd96..dd46194a2ae9cc9a62411891f4382a2892c345ba 100644 (file)
--- a/server/src/com/vaadin/server/WrappedPortletRequest.java
+++ b/server/src/com/vaadin/server/WrappedPortletRequest.java
@@ -43,7 +43,7 @@ public class WrappedPortletRequest implements WrappedRequest {
     private final PortletService vaadinService;
 
     /**
-     * Wraps a portlet request and an associated deployment configuration
+     * Wraps a portlet request and an associated vaadin service
      * 
      * @param request
      *            the portlet request to wrap

diff --git a/server/src/com/vaadin/server/WrappedPortletResponse.java b/server/src/com/vaadin/server/WrappedPortletResponse.java
index af4288fbefe06d8ff7b90811be5347e6868ee3ed..5888c33b434f6ff5c4d6c344c97c3645e3c03ba0 100644 (file)
--- a/server/src/com/vaadin/server/WrappedPortletResponse.java
+++ b/server/src/com/vaadin/server/WrappedPortletResponse.java
@@ -51,7 +51,7 @@ public class WrappedPortletResponse implements WrappedResponse {
     private PortletService vaadinService;
 
     /**
-     * Wraps a portlet response and an associated deployment configuration
+     * Wraps a portlet response and an associated vaadin service
      * 
      * @param response
      *            the portlet response to wrap

diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index e6d84a2b83ca0dd59edb4b9e1cf751d56fd360fd..d8d1521a4caec7865809980b0067d73ccb08105f 100644 (file)
--- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -29,8 +29,7 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase
         servlet = new VaadinServlet();
 
         // Workaround to avoid calling init and creating servlet config
-        Field f = VaadinServlet.class
-                .getDeclaredField("deploymentConfiguration");
+        Field f = VaadinServlet.class.getDeclaredField("servletService");
         f.setAccessible(true);
         f.set(servlet, new ServletService(servlet,
                 new DefaultApplicationConfiguration(servlet.getClass(),

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 2b4676bc429760b9da4f8eeadb113f456653592e..acc89895efe359c383f277a5fa55bba73b039d8a 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
+++ b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
@@ -72,13 +72,13 @@ public class CustomUIClassLoader extends TestCase {
     }
 
     private static WrappedRequest createRequestMock(ClassLoader classloader) {
-        // Mock a DeploymentConfiguration to give the passed classloader
+        // Mock a VaadinService to give the passed classloader
         VaadinService configurationMock = EasyMock
                 .createMock(VaadinService.class);
         EasyMock.expect(configurationMock.getClassLoader()).andReturn(
                 classloader);
 
-        // Mock a WrappedRequest to give the mocked deployment configuration
+        // Mock a WrappedRequest to give the mocked vaadin service
         WrappedRequest requestMock = EasyMock.createMock(WrappedRequest.class);
         EasyMock.expect(requestMock.getVaadinService()).andReturn(
                 configurationMock);