You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/06/12 17:17:10 UTC
cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader DefaultLoaderResolver.java
bloritsch 2003/06/12 08:17:10
Modified: src/java/org/apache/avalon/phoenix/components/classloader
DefaultLoaderResolver.java
Log:
Fix GUMP build. We need to get rid of our need on the class as it stands, and refactor it into something more friendly.
Spice Classman is removing the class.
Revision Changes Path
1.3 +558 -373 avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultLoaderResolver.java
Index: DefaultLoaderResolver.java
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultLoaderResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLoaderResolver.java 30 Apr 2003 10:16:48 -0000 1.2
+++ DefaultLoaderResolver.java 12 Jun 2003 15:17:10 -0000 1.3
@@ -1,373 +1,558 @@
-/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Avalon", "Phoenix" and "Apache Software Foundation"
- must not be used to endorse or promote products derived from this
- software without prior written permission. For written permission, please
- contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.avalon.phoenix.components.classloader;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import org.apache.avalon.phoenix.components.extensions.pkgmgr.PackageManager;
-import org.realityforge.classman.util.PathMatcher;
-
-/**
- * This resolver has all the same properties as the
- * {@link SimpleLoaderResolver} except that it also implements
- * scanning of filesets. It scans filesets based on classes
- * {@link #m_baseDirectory} value.
- *
- * @author <a href="mailto:peter at apache.org">Peter Donald</a>
- * @version $Revision$ $Date$
- * @deprecated Convert to ClassMan SimpleLoaderResolver when it updates
- * dependecy to latest Excalibur-Extension
- */
-class DefaultLoaderResolver
- extends SimpleLoaderResolver
-{
- /**
- * Create a resolver that resolves all files according to specied
- * baseDirectory and using specified {@link PackageManager} to aquire
- * {@link org.apache.avalon.excalibur.extension.Extension} objects.
- *
- * @param baseDirectory the base directory
- * @param manager the {@link PackageManager}
- */
- public DefaultLoaderResolver( final File baseDirectory,
- final PackageManager manager )
- {
- super( baseDirectory, manager );
- }
-
- /**
- * Resolve a fileset.
- *
- * @param baseDirectory the base directory of fileset
- * @param includes the list of ant-style includes
- * @param excludes the list of ant style excludes
- * @return the URLs contained within fileset
- * @throws Exception if unable to resolve fileset
- */
- public URL[] resolveFileSet( final String baseDirectory,
- final String[] includes,
- final String[] excludes )
- throws Exception
- {
- final File base = getFileFor( "." );
- return resolveFileSet( base, baseDirectory, includes, excludes );
- }
-
- /**
- * Resolve a fileset in a particular hierarchy.
- *
- * @param base the file hierarchy to use
- * @param baseDirectory the base directory (relative to base)
- * @param includes the ant-style include patterns
- * @param excludes the ant-style exclude patterns
- * @return the resolved URLs for fileset
- */
- protected final URL[] resolveFileSet( final File base,
- final String baseDirectory,
- final String[] includes,
- final String[] excludes )
- {
- //woefully inefficient .. but then again - no need
- //for efficency here
- final String newBaseDirectory = normalize( baseDirectory );
- final String[] newIncludes = prefixPatterns( newBaseDirectory, includes );
- final String[] newExcludes = prefixPatterns( newBaseDirectory, excludes );
- final PathMatcher matcher = new PathMatcher( newIncludes, newExcludes );
- final ArrayList urls = new ArrayList();
-
- scanDir( base, matcher, "", urls );
-
- return (URL[])urls.toArray( new URL[ urls.size() ] );
- }
-
- /**
- * Scan a directory trying to match files with matcher
- * and adding them to list of result urls if they match.
- * Recurse into sub-directorys.
- *
- * @param dir the directory to scan
- * @param matcher the matcher to use
- * @param path the virtual path to the current directory
- * @param urls the list of result URLs
- */
- private void scanDir( final File dir,
- final PathMatcher matcher,
- final String path,
- final ArrayList urls )
- {
- final File[] files = dir.listFiles();
- if( null == files )
- {
- final String message = "Bad dir specified: " + dir;
- throw new IllegalArgumentException( message );
- }
-
- String prefix = "";
- if( 0 != path.length() )
- {
- prefix = path + "/";
- }
-
- for( int i = 0; i < files.length; i++ )
- {
- final File file = files[ i ];
- final String newPath = prefix + file.getName();
- if( file.isDirectory() )
- {
- scanDir( file, matcher, newPath, urls );
- }
- else
- {
- if( matcher.match( newPath ) )
- {
- try
- {
- urls.add( file.toURL() );
- }
- catch( final MalformedURLException mue )
- {
- final String message = "Error converting " +
- file + " to url. Reason: " + mue;
- throw new IllegalArgumentException( message );
- }
- }
- }
- }
- }
-
- /**
- * Return a new array with specified prefix added to start of
- * every element in supplied array.
- *
- * @param prefix the prefix
- * @param patterns the source array
- * @return a new array with all elements having prefix added
- */
- private String[] prefixPatterns( final String prefix,
- final String[] patterns )
- {
- if( 0 == prefix.length() )
- {
- return patterns;
- }
-
- final String[] newPatterns = new String[ patterns.length ];
- for( int i = 0; i < newPatterns.length; i++ )
- {
- newPatterns[ i ] = prefix + "/" + patterns[ i ];
- }
- return newPatterns;
- }
-
- /**
- * Normalize a path. That means:
- * <ul>
- * <li>changes to unix style if under windows</li>
- * <li>eliminates "/../" and "/./"</li>
- * <li>if path is absolute (starts with '/') and there are
- * too many occurences of "../" (would then have some kind
- * of 'negative' path) returns null.</li>
- * <li>If path is relative, the exceeding ../ are kept at
- * the begining of the path.</li>
- * </ul>
- * <br><br>
- *
- * <b>Note:</b> note that this method has been tested with unix and windows only.
- *
- * <p>Eg:</p>
- * <pre>
- * /foo// --> /foo/
- * /foo/./ --> /foo/
- * /foo/../bar --> /bar
- * /foo/../bar/ --> /bar/
- * /foo/../bar/../baz --> /baz
- * //foo//./bar --> /foo/bar
- * /../ --> null
- * </pre>
- *
- * @param path the path to be normalized.
- * @return the normalized path or null.
- * @throws NullPointerException if path is null.
- */
- private static final String normalize( String path )
- {
- if( ".".equals( path ) || "./".equals( path ) )
- {
- return "";
- }
- else if( path.length() < 2 )
- {
- return path;
- }
-
- StringBuffer buff = new StringBuffer( path );
-
- int length = path.length();
-
- // this whole prefix thing is for windows compatibility only.
- String prefix = null;
-
- if( length > 2 && buff.charAt( 1 ) == ':' )
- {
- prefix = path.substring( 0, 2 );
- buff.delete( 0, 2 );
- path = path.substring( 2 );
- length -= 2;
- }
-
- boolean startsWithSlash = length > 0 && ( buff.charAt( 0 ) == '/' || buff.charAt( 0 ) == '\\' );
-
- boolean expStart = true;
- int ptCount = 0;
- int lastSlash = length + 1;
- int upLevel = 0;
-
- for( int i = length - 1; i >= 0; i-- )
- switch( path.charAt( i ) )
- {
- case '\\':
- buff.setCharAt( i, '/' );
- case '/':
- if( lastSlash == i + 1 )
- {
- buff.deleteCharAt( i );
- }
-
- switch( ptCount )
- {
- case 1:
- buff.delete( i, lastSlash );
- break;
-
- case 2:
- upLevel++;
- break;
-
- default:
- if( upLevel > 0 && lastSlash != i + 1 )
- {
- buff.delete( i, lastSlash + 3 );
- upLevel--;
- }
- break;
- }
-
- ptCount = 0;
- expStart = true;
- lastSlash = i;
- break;
-
- case '.':
- if( expStart )
- {
- ptCount++;
- }
- break;
-
- default:
- ptCount = 0;
- expStart = false;
- break;
- }
-
- switch( ptCount )
- {
- case 1:
- buff.delete( 0, lastSlash );
- break;
-
- case 2:
- break;
-
- default:
- if( upLevel > 0 )
- {
- if( startsWithSlash )
- {
- return null;
- }
- else
- {
- upLevel = 1;
- }
- }
-
- while( upLevel > 0 )
- {
- buff.delete( 0, lastSlash + 3 );
- upLevel--;
- }
- break;
- }
-
- length = buff.length();
- boolean isLengthNull = length == 0;
- char firstChar = isLengthNull?(char)0:buff.charAt( 0 );
-
- if( !startsWithSlash && !isLengthNull && firstChar == '/' )
- {
- buff.deleteCharAt( 0 );
- }
- else if( startsWithSlash &&
- ( isLengthNull || ( !isLengthNull && firstChar != '/' ) ) )
- {
- buff.insert( 0, '/' );
- }
-
- if( prefix != null )
- {
- buff.insert( 0, prefix );
- }
-
- return buff.toString();
- }
-}
+/*
+
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1997-2003 The Apache Software Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. The end-user documentation included with the redistribution, if any, must
+ include the following acknowledgment: "This product includes software
+ developed by the Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself, if
+ and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Avalon", "Phoenix" and "Apache Software Foundation"
+ must not be used to endorse or promote products derived from this
+ software without prior written permission. For written permission, please
+ contact apache@apache.org.
+
+ 5. Products derived from this software may not be called "Apache", nor may
+ "Apache" appear in their name, without prior written permission of the
+ Apache Software Foundation.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many individuals
+ on behalf of the Apache Software Foundation. For more information on the
+ Apache Software Foundation, please see <http://www.apache.org/>.
+
+*/
+package org.apache.avalon.phoenix.components.classloader;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import org.apache.avalon.phoenix.components.extensions.pkgmgr.PackageManager;
+import org.apache.oro.text.regex.Pattern;
+import org.apache.oro.text.regex.Perl5Compiler;
+import org.apache.oro.text.regex.MalformedPatternException;
+import org.apache.oro.text.regex.Perl5Matcher;
+
+/**
+ * This resolver has all the same properties as the
+ * {@link SimpleLoaderResolver} except that it also implements
+ * scanning of filesets. It scans filesets based on classes
+ * {@link #m_baseDirectory} value.
+ *
+ * @author <a href="mailto:peter at apache.org">Peter Donald</a>
+ * @version $Revision$ $Date$
+ * @deprecated Convert to ClassMan SimpleLoaderResolver when it updates
+ * dependecy to latest Excalibur-Extension
+ */
+class DefaultLoaderResolver
+ extends SimpleLoaderResolver
+{
+ /**
+ * Create a resolver that resolves all files according to specied
+ * baseDirectory and using specified {@link PackageManager} to aquire
+ * {@link org.apache.avalon.excalibur.extension.Extension} objects.
+ *
+ * @param baseDirectory the base directory
+ * @param manager the {@link PackageManager}
+ */
+ public DefaultLoaderResolver( final File baseDirectory,
+ final PackageManager manager )
+ {
+ super( baseDirectory, manager );
+ }
+
+ /**
+ * Resolve a fileset.
+ *
+ * @param baseDirectory the base directory of fileset
+ * @param includes the list of ant-style includes
+ * @param excludes the list of ant style excludes
+ * @return the URLs contained within fileset
+ * @throws Exception if unable to resolve fileset
+ */
+ public URL[] resolveFileSet( final String baseDirectory,
+ final String[] includes,
+ final String[] excludes )
+ throws Exception
+ {
+ final File base = getFileFor( "." );
+ return resolveFileSet( base, baseDirectory, includes, excludes );
+ }
+
+ /**
+ * Resolve a fileset in a particular hierarchy.
+ *
+ * @param base the file hierarchy to use
+ * @param baseDirectory the base directory (relative to base)
+ * @param includes the ant-style include patterns
+ * @param excludes the ant-style exclude patterns
+ * @return the resolved URLs for fileset
+ */
+ protected final URL[] resolveFileSet( final File base,
+ final String baseDirectory,
+ final String[] includes,
+ final String[] excludes )
+ {
+ //woefully inefficient .. but then again - no need
+ //for efficency here
+ final String newBaseDirectory = normalize( baseDirectory );
+ final String[] newIncludes = prefixPatterns( newBaseDirectory, includes );
+ final String[] newExcludes = prefixPatterns( newBaseDirectory, excludes );
+ final PathMatcher matcher = new PathMatcher( newIncludes, newExcludes );
+ final ArrayList urls = new ArrayList();
+
+ scanDir( base, matcher, "", urls );
+
+ return (URL[])urls.toArray( new URL[ urls.size() ] );
+ }
+
+ /**
+ * Scan a directory trying to match files with matcher
+ * and adding them to list of result urls if they match.
+ * Recurse into sub-directorys.
+ *
+ * @param dir the directory to scan
+ * @param matcher the matcher to use
+ * @param path the virtual path to the current directory
+ * @param urls the list of result URLs
+ */
+ private void scanDir( final File dir,
+ final PathMatcher matcher,
+ final String path,
+ final ArrayList urls )
+ {
+ final File[] files = dir.listFiles();
+ if( null == files )
+ {
+ final String message = "Bad dir specified: " + dir;
+ throw new IllegalArgumentException( message );
+ }
+
+ String prefix = "";
+ if( 0 != path.length() )
+ {
+ prefix = path + "/";
+ }
+
+ for( int i = 0; i < files.length; i++ )
+ {
+ final File file = files[ i ];
+ final String newPath = prefix + file.getName();
+ if( file.isDirectory() )
+ {
+ scanDir( file, matcher, newPath, urls );
+ }
+ else
+ {
+ if( matcher.match( newPath ) )
+ {
+ try
+ {
+ urls.add( file.toURL() );
+ }
+ catch( final MalformedURLException mue )
+ {
+ final String message = "Error converting " +
+ file + " to url. Reason: " + mue;
+ throw new IllegalArgumentException( message );
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Return a new array with specified prefix added to start of
+ * every element in supplied array.
+ *
+ * @param prefix the prefix
+ * @param patterns the source array
+ * @return a new array with all elements having prefix added
+ */
+ private String[] prefixPatterns( final String prefix,
+ final String[] patterns )
+ {
+ if( 0 == prefix.length() )
+ {
+ return patterns;
+ }
+
+ final String[] newPatterns = new String[ patterns.length ];
+ for( int i = 0; i < newPatterns.length; i++ )
+ {
+ newPatterns[ i ] = prefix + "/" + patterns[ i ];
+ }
+ return newPatterns;
+ }
+
+ /**
+ * Normalize a path. That means:
+ * <ul>
+ * <li>changes to unix style if under windows</li>
+ * <li>eliminates "/../" and "/./"</li>
+ * <li>if path is absolute (starts with '/') and there are
+ * too many occurences of "../" (would then have some kind
+ * of 'negative' path) returns null.</li>
+ * <li>If path is relative, the exceeding ../ are kept at
+ * the begining of the path.</li>
+ * </ul>
+ * <br><br>
+ *
+ * <b>Note:</b> note that this method has been tested with unix and windows only.
+ *
+ * <p>Eg:</p>
+ * <pre>
+ * /foo// --> /foo/
+ * /foo/./ --> /foo/
+ * /foo/../bar --> /bar
+ * /foo/../bar/ --> /bar/
+ * /foo/../bar/../baz --> /baz
+ * //foo//./bar --> /foo/bar
+ * /../ --> null
+ * </pre>
+ *
+ * @param path the path to be normalized.
+ * @return the normalized path or null.
+ * @throws NullPointerException if path is null.
+ */
+ private static final String normalize( String path )
+ {
+ if( ".".equals( path ) || "./".equals( path ) )
+ {
+ return "";
+ }
+ else if( path.length() < 2 )
+ {
+ return path;
+ }
+
+ StringBuffer buff = new StringBuffer( path );
+
+ int length = path.length();
+
+ // this whole prefix thing is for windows compatibility only.
+ String prefix = null;
+
+ if( length > 2 && buff.charAt( 1 ) == ':' )
+ {
+ prefix = path.substring( 0, 2 );
+ buff.delete( 0, 2 );
+ path = path.substring( 2 );
+ length -= 2;
+ }
+
+ boolean startsWithSlash = length > 0 && ( buff.charAt( 0 ) == '/' || buff.charAt( 0 ) == '\\' );
+
+ boolean expStart = true;
+ int ptCount = 0;
+ int lastSlash = length + 1;
+ int upLevel = 0;
+
+ for( int i = length - 1; i >= 0; i-- )
+ switch( path.charAt( i ) )
+ {
+ case '\\':
+ buff.setCharAt( i, '/' );
+ case '/':
+ if( lastSlash == i + 1 )
+ {
+ buff.deleteCharAt( i );
+ }
+
+ switch( ptCount )
+ {
+ case 1:
+ buff.delete( i, lastSlash );
+ break;
+
+ case 2:
+ upLevel++;
+ break;
+
+ default:
+ if( upLevel > 0 && lastSlash != i + 1 )
+ {
+ buff.delete( i, lastSlash + 3 );
+ upLevel--;
+ }
+ break;
+ }
+
+ ptCount = 0;
+ expStart = true;
+ lastSlash = i;
+ break;
+
+ case '.':
+ if( expStart )
+ {
+ ptCount++;
+ }
+ break;
+
+ default:
+ ptCount = 0;
+ expStart = false;
+ break;
+ }
+
+ switch( ptCount )
+ {
+ case 1:
+ buff.delete( 0, lastSlash );
+ break;
+
+ case 2:
+ break;
+
+ default:
+ if( upLevel > 0 )
+ {
+ if( startsWithSlash )
+ {
+ return null;
+ }
+ else
+ {
+ upLevel = 1;
+ }
+ }
+
+ while( upLevel > 0 )
+ {
+ buff.delete( 0, lastSlash + 3 );
+ upLevel--;
+ }
+ break;
+ }
+
+ length = buff.length();
+ boolean isLengthNull = length == 0;
+ char firstChar = isLengthNull?(char)0:buff.charAt( 0 );
+
+ if( !startsWithSlash && !isLengthNull && firstChar == '/' )
+ {
+ buff.deleteCharAt( 0 );
+ }
+ else if( startsWithSlash &&
+ ( isLengthNull || ( !isLengthNull && firstChar != '/' ) ) )
+ {
+ buff.insert( 0, '/' );
+ }
+
+ if( prefix != null )
+ {
+ buff.insert( 0, prefix );
+ }
+
+ return buff.toString();
+ }
+
+ /**
+ * Utility class for scanning a filesystem and matching a
+ * particular set of include and exclude patterns ala ant.
+ * This particular version is taken from Spice ClassMan and
+ * it will be refactored as soon as we can.
+ *
+ * @author <a href="mailto:peter at apache.org">Peter Donald</a>
+ */
+ public final class PathMatcher
+ {
+ /**
+ * The set of patterns that indicate paths to include.
+ */
+ private final Pattern[] m_includes;
+
+ /**
+ * The set of patterns that indicate paths to exclude.
+ * Takes precedence over includes.
+ */
+ private final Pattern[] m_excludes;
+
+ /**
+ * The object that is capable of performing the matching.
+ */
+ private final Perl5Matcher m_matcher = new Perl5Matcher();
+
+ /**
+ * Construct a matcher from ant style includes/excludes.
+ *
+ * @param includes the set of includes
+ * @param excludes the set of excludes
+ */
+ public PathMatcher( final String[] includes,
+ final String[] excludes )
+ {
+ if ( null == includes )
+ {
+ throw new NullPointerException( "includes" );
+ }
+ if ( null == excludes )
+ {
+ throw new NullPointerException( "excludes" );
+ }
+
+ m_includes = toPatterns( includes );
+ m_excludes = toPatterns( excludes );
+ }
+
+ /**
+ * Test if a virtual path matches any of the ant style
+ * patterns specified in this objects constructor.
+ *
+ * @param vPath the virtual path string
+ * @return true if matches, false otherwise
+ */
+ public boolean match( final String vPath )
+ {
+ if ( isExcluded( vPath ) )
+ {
+ return false;
+ }
+ else if ( isIncluded( vPath ) )
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Determine if specified path is excludes by patterns.
+ *
+ * @param vPath the virtual path
+ * @return true if excluded
+ */
+ private boolean isExcluded( final String vPath )
+ {
+ return testMatch( m_excludes, vPath );
+ }
+
+ /**
+ * Determine if specified path is includes by patterns.
+ *
+ * @param vPath the virtual path
+ * @return true if included
+ */
+ private boolean isIncluded( final String vPath )
+ {
+ return testMatch( m_includes, vPath );
+ }
+
+ /**
+ * Determine whether the virtual path matches
+ * specified patterns.
+ *
+ * @param patterns the patterns
+ * @param vPath the virtual path
+ * @return true if matches, false otherwise
+ */
+ private boolean testMatch( final Pattern[] patterns,
+ final String vPath )
+ {
+ for ( int i = 0; i < patterns.length; i++ )
+ {
+ if ( m_matcher.matches( vPath, patterns[i] ) )
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Convert a set of ant patterns into ORO Pattern objects.
+ *
+ * @param strs the ant style patterns
+ * @return the ORO Pattern objects
+ */
+ private Pattern[] toPatterns( final String[] strs )
+ {
+ final Perl5Compiler compiler = new Perl5Compiler();
+ final Pattern[] patterns = new Pattern[strs.length];
+ for ( int i = 0; i < patterns.length; i++ )
+ {
+ final String perlPatternStr = toPerlPatternStr( strs[i] );
+ try
+ {
+ patterns[i] = compiler.compile( perlPatternStr );
+ }
+ catch ( final MalformedPatternException mpe )
+ {
+ throw new IllegalArgumentException( mpe.toString() );
+ }
+ }
+ return patterns;
+ }
+
+ /**
+ * Convert an ant style fileset pattern to a Perl pattern.
+ *
+ * @param str the ant style pattern
+ * @return the perl pattern
+ */
+ private String toPerlPatternStr( String str )
+ {
+ final StringBuffer sb = new StringBuffer();
+ final int size = str.length();
+
+ for ( int i = 0; i < size; i++ )
+ {
+ final char ch = str.charAt( i );
+ if ( '.' == ch || '/' == ch || '\\' == ch )
+ {
+ sb.append( '\\' );
+ sb.append( ch );
+ }
+ else if ( '*' == ch )
+ {
+ if ( ( i + 2 ) < size &&
+ '*' == str.charAt( i + 1 ) &&
+ '/' == str.charAt( i + 2 ) )
+ {
+ sb.append( "([^/]*/)*" );
+ i += 2;
+ }
+ else
+ {
+ sb.append( "[^/]*" );
+ }
+ }
+ else
+ {
+ sb.append( ch );
+ }
+ }
+
+ return sb.toString();
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org
Re: cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader
DefaultLoaderResolver.java
Posted by Berin Loritsch <bl...@apache.org>.
Peter Royal wrote:
> On Thursday, June 12, 2003, at 11:17 AM, bloritsch@apache.org wrote:
>
>
>
> Can you fix your IDE/environment to not mange the line endings? Makes
> it hard to see exactly what was changed :)
>
> If you are doing a diff before checkin to see what the changes are,
> just make sure that the diff isn't ignoring whitespace.
> -pete
Ack'd
It was a problem of copying from the web browser to the class....
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader DefaultLoaderResolver.java
Posted by Peter Royal <pr...@apache.org>.
On Thursday, June 12, 2003, at 11:17 AM, bloritsch@apache.org wrote:
> bloritsch 2003/06/12 08:17:10
>
> Modified:
> src/java/org/apache/avalon/phoenix/components/classloader
> DefaultLoaderResolver.java
> Log:
> Fix GUMP build. We need to get rid of our need on the class as it
> stands, and refactor it into something more friendly.
> Spice Classman is removing the class.
>
> Revision Changes Path
> 1.3 +558 -373
> avalon-phoenix/src/java/org/apache/avalon/phoenix/components/
> classloader/DefaultLoaderResolver.java
>
> Index: DefaultLoaderResolver.java
> ===================================================================
> RCS file:
> /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/
> components/classloader/DefaultLoaderResolver.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- DefaultLoaderResolver.java 30 Apr 2003 10:16:48 -0000 1.2
> +++ DefaultLoaderResolver.java 12 Jun 2003 15:17:10 -0000 1.3
> @@ -1,373 +1,558 @@
> -/*
> -
> -
> =======================================================================
> =====
Can you fix your IDE/environment to not mange the line endings? Makes
it hard to see exactly what was changed :)
If you are doing a diff before checkin to see what the changes are,
just make sure that the diff isn't ignoring whitespace.
-pete
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org