donaldp 2002/10/31 13:33:23
Modified: loader/src/java/org/apache/excalibur/loader/builder
DefaultLoaderResolver.java
Log:
Fix problem where filesets that were not rooted in base would not match any entrys
Revision Changes Path
1.5 +3 -3
jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder/DefaultLoaderResolver.java
Index: DefaultLoaderResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder/DefaultLoaderResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultLoaderResolver.java 31 Oct 2002 21:19:49 -0000 1.4
+++ DefaultLoaderResolver.java 31 Oct 2002 21:33:23 -0000 1.5
@@ -54,7 +54,7 @@
final String[] excludes )
throws Exception
{
- final File base = getFileFor( baseDirectory );
+ final File base = getFileFor( "." );
return resolveFileSet( base, baseDirectory, includes, excludes );
}
@@ -159,7 +159,7 @@
final String[] newPatterns = new String[ patterns.length ];
for( int i = 0; i < newPatterns.length; i++ )
{
- newPatterns[ i ] = prefix + "/" + newPatterns[ i ];
+ newPatterns[ i ] = prefix + "/" + patterns[ i ];
}
return newPatterns;
}
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
