diff options
Diffstat (limited to 'jetty-deploy')
6 files changed, 22 insertions, 7 deletions
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java index d48592a947..9e9a9cf41f 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java @@ -83,7 +83,7 @@ public class GlobalWebappConfigBinding implements AppLifeCycle.Binding Log.warn("Binding: global context binding is enabled but no jetty-web.xml file has been registered"); } - Resource globalContextSettings = new FileResource(new URL(_jettyXml)); + Resource globalContextSettings = Resource.newResource(_jettyXml); if (globalContextSettings.exists()) { diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java index 953c4875f2..4d93154dfa 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java @@ -18,11 +18,13 @@ package org.eclipse.jetty.deploy.bindings; import static org.hamcrest.Matchers.*; import java.io.File; +import java.util.List; import org.eclipse.jetty.deploy.providers.ScanningAppProvider; import org.eclipse.jetty.deploy.test.XmlConfiguredJetty; import org.eclipse.jetty.toolchain.test.IO; 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.webapp.WebAppContext; import org.junit.After; @@ -62,13 +64,20 @@ public class GlobalWebappConfigBindingTest @Test public void testServerAndSystemClassesOverride() throws Exception { - IO.copy(MavenTestingUtils.getTestResourceFile("context-binding-test-1.xml"),new File(jetty.getJettyHome(),"context-binding-test-1.xml")); + File srcXml = MavenTestingUtils.getTestResourceFile("context-binding-test-1.xml"); + File destXml = new File(jetty.getJettyHome(),"context-binding-test-1.xml"); + IO.copy(srcXml,destXml); + + PathAssert.assertFileExists("Context Binding XML",destXml); jetty.addConfiguration("binding-test-contexts-1.xml"); jetty.load(); jetty.start(); - WebAppContext context = jetty.getWebAppContexts().get(0); + List<WebAppContext> contexts = jetty.getWebAppContexts(); + Assert.assertThat("List of Contexts", contexts, hasSize(greaterThan(0))); + + WebAppContext context = contexts.get(0); Assert.assertNotNull("Context should not be null",context); String defaultClasses[] = context.getDefaultServerClasses(); diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java index 7741259f07..b54addf5e5 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java @@ -21,10 +21,12 @@ import java.util.concurrent.atomic.AtomicInteger; import org.eclipse.jetty.deploy.AppProvider; import org.eclipse.jetty.deploy.DeploymentManager; import org.eclipse.jetty.deploy.test.XmlConfiguredJetty; +import org.eclipse.jetty.toolchain.test.OS; import org.eclipse.jetty.toolchain.test.TestingDir; import org.eclipse.jetty.util.Scanner; import org.eclipse.jetty.util.log.Log; import org.junit.After; +import org.junit.Assume; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -137,6 +139,10 @@ public class ScanningAppProviderRuntimeUpdatesTest @Test public void testAfterStartupThenUpdateContext() throws Exception { + // This test will not work on Windows as second war file would + // not be written over the first one because of a file lock + Assume.assumeTrue(!OS.IS_WINDOWS); + jetty.copyWebapp("foo-webapp-1.war","foo.war"); jetty.copyContext("foo.xml","foo.xml"); 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 62ab9e64da..db047df32e 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 @@ -123,7 +123,7 @@ public class XmlConfiguredJetty properties.setProperty("test.workdir",workishDir.getAbsolutePath()); // Write out configuration for use by ConfigurationManager. - File testConfig = MavenTestingUtils.getTargetFile("xml-configured-jetty.properties"); + File testConfig = new File(_jettyHome, "xml-configured-jetty.properties"); FileOutputStream out = new FileOutputStream(testConfig); properties.store(out,"Generated by " + XmlConfiguredJetty.class.getName()); for (Object key:properties.keySet()) diff --git a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml index 059fa0bb9c..65e13ab5cf 100644 --- a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml +++ b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml @@ -36,7 +36,7 @@ <Call name="addLifeCycleBinding"> <Arg> <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding"> - <Set name="jettyXml">file://<SystemProperty name="jetty.home" />/context-binding-test-1.xml</Set> + <Set name="jettyXml"><SystemProperty name="jetty.home" />/context-binding-test-1.xml</Set> </New> </Arg> </Call> @@ -52,7 +52,7 @@ <Set name="configurationManager"> <New class="org.eclipse.jetty.deploy.FileConfigurationManager"> <Set name="file"> - <Property name="test.targetdir" default="target" />/xml-configured-jetty.properties + <SystemProperty name="jetty.home"/>/xml-configured-jetty.properties </Set> </New> </Set> diff --git a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml index f383239947..c542672b85 100644 --- a/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml +++ b/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml @@ -20,7 +20,7 @@ <Set name="configurationManager"> <New class="org.eclipse.jetty.deploy.FileConfigurationManager"> <Set name="file"> - <Property name="test.targetdir" default="target" />/xml-configured-jetty.properties + <SystemProperty name="jetty.home"/>/xml-configured-jetty.properties </Set> </New> </Set> |