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

VERSION.txt

@@ -2,6 +2,7 @@ jetty-7.4.3-SNAPSHOT
  + 295832 ProxyServlet more extensible and configurable
  + 302566 GZIP handler for embedded Jetty servers
  + 332200 Eliminate expected exceptions from log while using org.eclipse.jetty.jmx bundle
+ + 347468 o.e.j.deploy.binding.GlobalWebappConfigBindingTest fails on Windows platform
  + 347617 Dynamically install/update/remove OSGi bundles discovered in the contexts folder
  + 347717 start.jar destroys dependent child of --exec
  + 347889 OSGi should follow directive visibility:=reexport for META-INF/web-fragments and resources

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())
             {

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

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>