Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gorovoy2011-06-28 18:00:19 +0000
committerMichael Gorovoy2011-06-28 18:00:19 +0000
commit9235b429bbaba7013e18e5842af948caf22a2a22 (patch)
treed88083a90e4303b77f5c61be47bebc81a6fbeb61 /jetty-deploy/src/test
parent77394d0c4bbad700817cdc2a4b2ee7ffac252af6 (diff)
downloadorg.eclipse.jetty.project-9235b429bbaba7013e18e5842af948caf22a2a22.tar.gz
org.eclipse.jetty.project-9235b429bbaba7013e18e5842af948caf22a2a22.tar.xz
org.eclipse.jetty.project-9235b429bbaba7013e18e5842af948caf22a2a22.zip
347468 o.e.j.deploy.binding.GlobalWebappConfigBindingTest fails on Windows platform
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3432 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-deploy/src/test')
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java4
-rw-r--r--jetty-deploy/src/test/resources/binding-test-contexts-1.xml2
2 files changed, 3 insertions, 3 deletions
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 94a1b752dc..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
@@ -66,11 +66,11 @@ public class XmlConfiguredJetty
String jettyHomeBase = testdir.getDir().getAbsolutePath();
// Ensure we have a new (pristene) directory to work with.
int idx = 0;
- _jettyHome = new File(jettyHomeBase + "_" + idx);
+ _jettyHome = new File(jettyHomeBase + "#" + idx);
while (_jettyHome.exists())
{
idx++;
- _jettyHome = new File(jettyHomeBase + "_" + idx);
+ _jettyHome = new File(jettyHomeBase + "#" + idx);
}
deleteContents(_jettyHome);
// Prepare Jetty.Home (Test) dir
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 39c8da87e5..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>

Back to the top