409556 Resource files not closed

Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.

FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed

1 files changed, 5 insertions, 8 deletions

diff --git a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java
index dca34758fc..47ecd5bc0e 100644
--- a/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java
+++ b/jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebAppContext.java
@@ -540,9 +540,8 @@ public class AntWebAppContext extends WebAppContext
         
         if (getDescriptor() != null)
         {
-            try
+            try (Resource r = Resource.newResource(getDescriptor());)
             {
-                Resource r = Resource.newResource(getDescriptor());
                 scanList.add(r.getFile());
             }
             catch (IOException e)
@@ -553,9 +552,8 @@ public class AntWebAppContext extends WebAppContext
 
         if (getJettyEnvXml() != null)
         {
-            try
+            try (Resource r = Resource.newResource(getJettyEnvXml());)
             {
-                Resource r = Resource.newResource(getJettyEnvXml());
                 scanList.add(r.getFile());
             }
             catch (IOException e)
@@ -566,11 +564,10 @@ public class AntWebAppContext extends WebAppContext
 
         if (getDefaultsDescriptor() != null)
         {
-            try
+            try (Resource r = Resource.newResource(getDefaultsDescriptor());)
             {
-                if (!AntWebAppContext.WEB_DEFAULTS_XML.equals(getDefaultsDescriptor()))
-                {
-                    Resource r = Resource.newResource(getDefaultsDescriptor());
+                if (!WebAppContext.WEB_DEFAULTS_XML.equals(getDefaultsDescriptor()))
+                {   
                     scanList.add(r.getFile());
                 }
             }