diff options
author | Leif Åstrand <leif@vaadin.com> | 2012-09-06 10:18:56 +0300 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2012-09-06 10:20:42 +0300 |
commit | adbbf9704e478df135c0a693dcda31a9cca1e7ab (patch) | |
tree | 2a1b6da34ee9c84d03c324780f90b0b29f4bf633 /uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java | |
parent | 4d2031b1278ae78be7b35ae1e27971b98524ee91 (diff) | |
download | vaadin-framework-adbbf9704e478df135c0a693dcda31a9cca1e7ab.tar.gz vaadin-framework-adbbf9704e478df135c0a693dcda31a9cca1e7ab.zip |
Rename DeploymentConfiguration -> VaadinService (#9402)
Diffstat (limited to 'uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java')
-rw-r--r-- | uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java | 11 |
1 files changed, 4 insertions, 7 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); |