diff options
Diffstat (limited to 'jetty-deploy')
3 files changed, 4 insertions, 3 deletions
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java index f979243d75..a4520fabfe 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java @@ -219,7 +219,7 @@ public class ContextDeployer extends AbstractLifeCycle @Deprecated public void setConfigurationDir(File file) throws Exception { - setConfigurationDir(Resource.newResource(file.toURL())); + setConfigurationDir(Resource.newResource(Resource.toURL(file))); } /* ------------------------------------------------------------ */ diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/MockAppProvider.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/MockAppProvider.java index 0a5f541afd..7418a2877b 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/MockAppProvider.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/MockAppProvider.java @@ -52,7 +52,7 @@ public class MockAppProvider extends AbstractLifeCycle implements AppProvider WebAppContext context = new WebAppContext(); File war = new File(webappsDir,app.getOriginId().substring(5)); - context.setWar(Resource.newResource(war.toURI().toURL()).toString()); + context.setWar(Resource.newResource(Resource.toURL(war)).toString()); String path = war.getName(); diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java index db047df32e..270b9fbcd8 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java @@ -42,6 +42,7 @@ import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.toolchain.test.PathAssert; import org.eclipse.jetty.toolchain.test.TestingDir; import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.xml.XmlConfiguration; import org.junit.Assert; @@ -132,7 +133,7 @@ public class XmlConfiguredJetty public void addConfiguration(File xmlConfigFile) throws MalformedURLException { - _xmlConfigurations.add(xmlConfigFile.toURI().toURL()); + _xmlConfigurations.add(Resource.toURL(xmlConfigFile)); } public void addConfiguration(String testConfigName) throws MalformedURLException |