You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by dk...@apache.org on 2007/11/29 16:09:16 UTC

svn commit: r599471 - /maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java

Author: dkulp
Date: Thu Nov 29 07:09:15 2007
New Revision: 599471

URL: http://svn.apache.org/viewvc?rev=599471&view=rev
Log:
Update classloader to go back to the parent if the resource doesn't exist.   Thus, velocity can find it's own stuff.

Modified:
    maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java?rev=599471&r1=599470&r2=599471&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java Thu Nov 29 07:09:15 2007
@@ -44,13 +44,23 @@
     // that we have provided.   Thus, we don't pull junk from the
     // system classpath jars and stuff instead of the jars
     // we specifically provided
-    public URL getResource(String name) 
+    public URL getResource( String name ) 
     {
-        return findResource(name);
+        URL url = findResource( name );
+        if ( url == null )
+        {
+            url = super.getResource( name );
+        }
+        return url;
     }
-    public Enumeration getResources(String name) throws IOException 
+    public Enumeration getResources( String name ) throws IOException 
     {
-        return findResources(name);
+        Enumeration en = findResources( name );
+        if ( en == null || !en.hasMoreElements() )
+        {
+            en = super.getResources( name );
+        }
+        return en;
     }
 
 }