merge from jetty-8

jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java

@@ -65,6 +65,19 @@ class JarFileResource extends JarResource
         _list=null;
         _entry=null;
         _file=null;
+        
+        if ( _jarFile != null )
+        {
+            try
+            {
+                _jarFile.close();
+            }
+            catch ( IOException ioe )
+            {
+                LOG.ignore(ioe);
+            }
+        }
+        
         _jarFile=null;
         super.release();
     }
@@ -303,12 +316,11 @@ class JarFileResource extends JarResource
                     throw new IllegalStateException();
         }
         
-        Enumeration e=jarFile.entries();
+        Enumeration<JarEntry> e=jarFile.entries();
         String dir=_urlString.substring(_urlString.indexOf("!/")+2);
         while(e.hasMoreElements())
         {
-            
-            JarEntry entry = (JarEntry) e.nextElement();               
+            JarEntry entry = e.nextElement();               
             String name=entry.getName().replace('\\','/');               
             if(!name.startsWith(dir) || name.length()==dir.length())
             {

jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java

@@ -32,8 +32,13 @@ import java.net.URL;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+
+import java.util.TimeZone;
+import java.util.jar.JarFile;
 import java.util.zip.ZipFile;
 
+import junit.framework.Assert;
+
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.toolchain.test.OS;
 import org.eclipse.jetty.util.IO;
@@ -121,11 +126,15 @@ public class ResourceTest
         file=new File(file.getCanonicalPath());
         URI uri = file.toURI();
         __userURL=uri.toURL();
-
-        __userURL = new URL(__userURL.toString() + "src/test/resources/org/eclipse/jetty/util/resource/");
-        FilePermission perm = (FilePermission) __userURL.openConnection().getPermission();
-        __userDir = new File(perm.getName()).getCanonicalPath() + File.separatorChar;
-        __relDir = "src/test/resources/org/eclipse/jetty/util/resource/".replace('/', File.separatorChar);
+        
+        __userURL = MavenTestingUtils.getTestResourcesDir().toURI().toURL();
+	FilePermission perm = (FilePermission) __userURL.openConnection().getPermission();
+	__userDir = new File(perm.getName()).getCanonicalPath() + File.separatorChar;
+	__relDir = "src/test/resources/".replace('/', File.separatorChar);  
+        
+        //System.err.println("User Dir="+__userDir);
+        //System.err.println("Rel  Dir="+__relDir);
+        //System.err.println("User URL="+__userURL);
 
         tmpFile=File.createTempFile("test",null).getCanonicalFile();
         tmpFile.deleteOnExit();
@@ -319,14 +328,16 @@ public class ResourceTest
     throws Exception
     {
         String s = "jar:"+__userURL+"TestData/test.zip!/subdir/numbers";
-        ZipFile zf = new ZipFile(MavenTestingUtils.getProjectFile("src/test/resources/org/eclipse/jetty/util/resource/TestData/test.zip"));
 
+        
+        ZipFile zf = new ZipFile(MavenTestingUtils.getTestResourceFile("TestData/test.zip"));
+        
         long last = zf.getEntry("subdir/numbers").getTime();
 
         Resource r = Resource.newResource(s);
         assertEquals(last,r.lastModified());
     }
-
+    
     /* ------------------------------------------------------------ */
     @Test
     public void testJarFileCopyToDirectoryTraversal () throws Exception

jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Descriptor.java

@@ -60,10 +60,14 @@ public abstract class Descriptor
         
         if (_root == null)
         {
-            //boolean oldValidating = _processor.getParser().getValidating();
-            //_processor.getParser().setValidating(_validating);
-            _root = _parser.parse(_xml.getURL().toString());
-            //_processor.getParser().setValidating(oldValidating);
+            try
+            {
+                _root = _parser.parse(_xml.getInputStream());
+            }
+            finally
+            {
+                _xml.release();
+            }
         }
     }