+ *
* This is not a general purpose test and should only be used if you * can live with false positives. For example,pattern=**\a
* and str=b will yield true.
@@ -148,39 +140,36 @@ public void setCaseSensitive( boolean isCaseSensitive )
* null.
* @param str The path to match, as a String. Must not be
* null.
- *
* @return whether or not a given path matches the start of a given
- * pattern up to the first "**".
+ * pattern up to the first "**".
*/
protected static boolean matchPatternStart( String pattern, String str )
{
return SelectorUtils.matchPatternStart( pattern, str );
}
-
+
/**
* Tests whether or not a given path matches the start of a given
* pattern up to the first "**".
- * + *
* This is not a general purpose test and should only be used if you * can live with false positives. For example,pattern=**\a
* and str=b will yield true.
*
- * @param pattern The pattern to match against. Must not be
- * null.
- * @param str The path to match, as a String. Must not be
- * null.
+ * @param pattern The pattern to match against. Must not be
+ * null.
+ * @param str The path to match, as a String. Must not be
+ * null.
* @param isCaseSensitive Whether or not matching should be performed
* case sensitively.
- *
* @return whether or not a given path matches the start of a given
- * pattern up to the first "**".
+ * pattern up to the first "**".
*/
- protected static boolean matchPatternStart( String pattern, String str,
- boolean isCaseSensitive )
+ protected static boolean matchPatternStart( String pattern, String str, boolean isCaseSensitive )
{
return SelectorUtils.matchPatternStart( pattern, str, isCaseSensitive );
}
-
+
/**
* Tests whether or not a given path matches a given pattern.
*
@@ -188,7 +177,6 @@ protected static boolean matchPatternStart( String pattern, String str,
* null.
* @param str The path to match, as a String. Must not be
* null.
- *
* @return true if the pattern matches against the string,
* or false otherwise.
*/
@@ -196,26 +184,24 @@ protected static boolean matchPath( String pattern, String str )
{
return SelectorUtils.matchPath( pattern, str );
}
-
+
/**
* Tests whether or not a given path matches a given pattern.
*
- * @param pattern The pattern to match against. Must not be
- * null.
- * @param str The path to match, as a String. Must not be
- * null.
+ * @param pattern The pattern to match against. Must not be
+ * null.
+ * @param str The path to match, as a String. Must not be
+ * null.
* @param isCaseSensitive Whether or not matching should be performed
* case sensitively.
- *
* @return true if the pattern matches against the string,
* or false otherwise.
*/
- protected static boolean matchPath( String pattern, String str,
- boolean isCaseSensitive )
+ protected static boolean matchPath( String pattern, String str, boolean isCaseSensitive )
{
return SelectorUtils.matchPath( pattern, str, isCaseSensitive );
}
-
+
/**
* Tests whether or not a string matches against a pattern.
* The pattern may contain two special characters:null.
* @param str The string which must be matched against the pattern.
* Must not be null.
- *
* @return true if the string matches against the pattern,
* or false otherwise.
*/
@@ -234,43 +219,40 @@ public static boolean match( String pattern, String str )
{
return SelectorUtils.match( pattern, str );
}
-
+
/**
* Tests whether or not a string matches against a pattern.
* The pattern may contain two special characters:null.
- * @param str The string which must be matched against the pattern.
- * Must not be null.
+ * @param pattern The pattern to match against.
+ * Must not be null.
+ * @param str The string which must be matched against the pattern.
+ * Must not be null.
* @param isCaseSensitive Whether or not matching should be performed
* case sensitively.
- *
- *
* @return true if the string matches against the pattern,
* or false otherwise.
*/
- protected static boolean match( String pattern, String str,
- boolean isCaseSensitive )
+ protected static boolean match( String pattern, String str, boolean isCaseSensitive )
{
return SelectorUtils.match( pattern, str, isCaseSensitive );
}
-
-
+
+
/**
* Sets the list of include patterns to use. All '/' and '\' characters
* are replaced by File.separatorChar, so the separator used
* need not match File.separatorChar.
- * + *
* When a pattern ends with a '/' or '\', "**" is appended. * * @param includes A list of include patterns. * May benull, indicating that all files
* should be included. If a non-null
* list is given, all elements must be
- * non-null.
+ * non-null.
*/
public void setIncludes( String[] includes )
{
@@ -287,12 +269,12 @@ public void setIncludes( String[] includes )
}
}
}
-
+
/**
* Sets the list of exclude patterns to use. All '/' and '\' characters
* are replaced by File.separatorChar, so the separator used
* need not match File.separatorChar.
- * + *
* When a pattern ends with a '/' or '\', "**" is appended. * * @param excludes A list of exclude patterns. @@ -318,7 +300,7 @@ public void setExcludes( String[] excludes ) /** * Normalizes the pattern, e.g. converts forward and backward slashes to the platform-specific file separator. - * + * * @param pattern The pattern to normalize, must not benull.
* @return The normalized pattern, never null.
*/
@@ -360,16 +342,14 @@ private String normalizePattern( String pattern )
*/
protected boolean isIncluded( String name )
{
- for ( int i = 0; i < includes.length; i++ )
- {
- if ( matchPath( includes[i], name, isCaseSensitive ) )
- {
- return true;
- }
- }
- return false;
+ return includesPatterns.matches( name, isCaseSensitive );
}
-
+
+ protected boolean isIncluded( String name, String[] tokenizedName )
+ {
+ return includesPatterns.matches( name, tokenizedName, isCaseSensitive );
+ }
+
/**
* Tests whether or not a name matches the start of at least one include
* pattern.
@@ -380,16 +360,9 @@ protected boolean isIncluded( String name )
*/
protected boolean couldHoldIncluded( String name )
{
- for ( int i = 0; i < includes.length; i++ )
- {
- if ( matchPatternStart( includes[i], name, isCaseSensitive ) )
- {
- return true;
- }
- }
- return false;
+ return includesPatterns.matchesPatternStart(name, isCaseSensitive);
}
-
+
/**
* Tests whether or not a name matches against at least one exclude
* pattern.
@@ -400,16 +373,14 @@ protected boolean couldHoldIncluded( String name )
*/
protected boolean isExcluded( String name )
{
- for ( int i = 0; i < excludes.length; i++ )
- {
- if ( matchPath( excludes[i], name, isCaseSensitive ) )
- {
- return true;
- }
- }
- return false;
+ return excludesPatterns.matches( name, isCaseSensitive );
+ }
+
+ protected boolean isExcluded( String name, String[] tokenizedName )
+ {
+ return excludesPatterns.matches( name, tokenizedName, isCaseSensitive );
}
-
+
/**
* Adds default exclusions to the current exclusions set.
*/
@@ -428,8 +399,8 @@ public void addDefaultExcludes()
}
excludes = newExcludes;
}
-
- protected void setupDefaultFilters()
+
+ protected void setupDefaultFilters()
{
if ( includes == null )
{
@@ -442,4 +413,10 @@ protected void setupDefaultFilters()
excludes = new String[0];
}
}
+
+ protected void setupMatchPatterns()
+ {
+ includesPatterns = MatchPatterns.from( includes );
+ excludesPatterns = MatchPatterns.from( excludes );
+ }
}
diff --git a/src/main/java/org/codehaus/plexus/util/CollectionUtils.java b/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
index 4192b79f..1762b9ab 100644
--- a/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
@@ -55,7 +55,7 @@ public class CollectionUtils
* @param recessiveMap Recessive Map.
* @return The result map with combined dominant and recessive values.
*/
- public static Map mergeMaps( Map dominantMap, Map recessiveMap )
+ public static + *
* These criteria consist of selectors and patterns which have been specified. * With the selectors you can select which files you want to have included. * Files which are not selected are excluded. With patterns you can include * or exclude files based on their filename. - *+ *
* The idea is simple. A given directory is recursively scanned for all files * and directories. Each file/directory is matched against a set of selectors, * including special support for matching against filenames with include and @@ -74,12 +75,12 @@ * pattern of the include pattern list or other file selector, and don't match * any pattern of the exclude pattern list or fail to match against a required * selector will be placed in the list of files/directories found. - *+ *
* When no list of include patterns is supplied, "**" will be used, which * means that everything will be matched. When no list of exclude patterns is * supplied, an empty list is used, such that nothing will be excluded. When * no selectors are supplied, none are applied. - *+ *
* The filename pattern matching is done as follows: * The name to be matched is split up in path segments. A path segment is the * name of a directory or file, which is bounded by @@ -87,11 +88,11 @@ * For example, "abc/def/ghi/xyz.java" is split up in the segments "abc", * "def","ghi" and "xyz.java". * The same is done for the pattern against which should be matched. - *+ *
* The segments of the name and the pattern are then matched against each * other. When '**' is used for a path segment in the pattern, it matches * zero or more path segments of the name. - *+ *
* There is a special case regarding the use ofFile.separators
* at the beginning of the pattern and the string to match:File.separator, the string
@@ -100,27 +101,27 @@
* string to match may not start with a File.separator.
* When one of these rules is not obeyed, the string will not
* match.
- * + *
* When a name path segment is matched against a pattern path segment, the * following special characters can be used:+ *
* Examples: - *+ *
* "**\*.class" matches all .class files/dirs in a directory tree. - *+ *
* "test\a??.java" matches all files/dirs which start with an 'a', then two * more characters and then ".java", in a directory called test. - *+ *
* "**" matches everything in a directory tree. - *+ *
* "**\test\**\XYZ*" matches all files/dirs which start with "XYZ" and where * there is a parent directory called test (e.g. "abc\test\def\ghi\XYZ123"). - *+ *
* Case sensitivity may be turned off if necessary. By default, it is * turned on. - *+ *
* Example of usage: *
* String[] includes = {"**\\*.class"};
@@ -141,56 +142,69 @@
* files in all proper subdirectories of a directory called "modules"
*
* @author Arnout J. Kuiper
- * ajkuiper@wxs.nl
+ * ajkuiper@wxs.nl
* @author Magesh Umasankar
* @author Bruce Atherton
* @author Antoine Levy-Lambert
*/
-public class DirectoryScanner extends AbstractScanner
+public class DirectoryScanner
+ extends AbstractScanner
{
- /** The base directory to be scanned. */
+ /**
+ * The base directory to be scanned.
+ */
protected File basedir;
- /** The files which matched at least one include and no excludes
- * and were selected.
+ /**
+ * The files which matched at least one include and no excludes
+ * and were selected.
*/
- protected Vector filesIncluded;
+ protected Vector filesIncluded;
- /** The files which did not match any includes or selectors. */
- protected Vector filesNotIncluded;
+ /**
+ * The files which did not match any includes or selectors.
+ */
+ protected Vector filesNotIncluded;
/**
* The files which matched at least one include and at least
* one exclude.
*/
- protected Vector filesExcluded;
+ protected Vector filesExcluded;
- /** The directories which matched at least one include and no excludes
- * and were selected.
+ /**
+ * The directories which matched at least one include and no excludes
+ * and were selected.
*/
- protected Vector dirsIncluded;
+ protected Vector dirsIncluded;
- /** The directories which were found and did not match any includes. */
- protected Vector dirsNotIncluded;
+ /**
+ * The directories which were found and did not match any includes.
+ */
+ protected Vector dirsNotIncluded;
/**
* The directories which matched at least one include and at least one
* exclude.
*/
- protected Vector dirsExcluded;
+ protected Vector dirsExcluded;
- /** The files which matched at least one include and no excludes and
- * which a selector discarded.
+ /**
+ * The files which matched at least one include and no excludes and
+ * which a selector discarded.
*/
- protected Vector filesDeselected;
+ protected Vector filesDeselected;
- /** The directories which matched at least one include and no excludes
- * but which a selector discarded.
+ /**
+ * The directories which matched at least one include and no excludes
+ * but which a selector discarded.
*/
- protected Vector dirsDeselected;
+ protected Vector dirsDeselected;
- /** Whether or not our results were built by a slow scan. */
+ /**
+ * Whether or not our results were built by a slow scan.
+ */
protected boolean haveSlowResults = false;
/**
@@ -200,9 +214,13 @@ public class DirectoryScanner extends AbstractScanner
*/
private boolean followSymlinks = true;
- /** Whether or not everything tested so far has been included. */
+ /**
+ * Whether or not everything tested so far has been included.
+ */
protected boolean everythingIncluded = true;
+ private final String[] tokenizedEmpty = MatchPattern.tokenizePathToString( "", File.separator );
+
/**
* Sole constructor.
*/
@@ -221,8 +239,7 @@ public DirectoryScanner()
*/
public void setBasedir( String basedir )
{
- setBasedir( new File( basedir.replace( '/', File.separatorChar ).replace(
- '\\', File.separatorChar ) ) );
+ setBasedir( new File( basedir.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar ) ) );
}
/**
@@ -275,11 +292,12 @@ public boolean isEverythingIncluded()
* pattern and don't match any exclude patterns. If there are selectors
* then the files must pass muster there, as well.
*
- * @exception IllegalStateException if the base directory was set
- * incorrectly (i.e. if it is null, doesn't exist,
- * or isn't a directory).
+ * @throws IllegalStateException if the base directory was set
+ * incorrectly (i.e. if it is null, doesn't exist,
+ * or isn't a directory).
*/
- public void scan() throws IllegalStateException
+ public void scan()
+ throws IllegalStateException
{
if ( basedir == null )
{
@@ -287,29 +305,29 @@ public void scan() throws IllegalStateException
}
if ( !basedir.exists() )
{
- throw new IllegalStateException( "basedir " + basedir
- + " does not exist" );
+ throw new IllegalStateException( "basedir " + basedir + " does not exist" );
}
if ( !basedir.isDirectory() )
{
- throw new IllegalStateException( "basedir " + basedir
- + " is not a directory" );
+ throw new IllegalStateException( "basedir " + basedir + " is not a directory" );
}
setupDefaultFilters();
-
- filesIncluded = new Vector();
- filesNotIncluded = new Vector();
- filesExcluded = new Vector();
- filesDeselected = new Vector();
- dirsIncluded = new Vector();
- dirsNotIncluded = new Vector();
- dirsExcluded = new Vector();
- dirsDeselected = new Vector();
-
- if ( isIncluded( "" ) )
+ setupMatchPatterns();
+
+ filesIncluded = new Vector();
+ filesNotIncluded = new Vector();
+ filesExcluded = new Vector();
+ filesDeselected = new Vector();
+ dirsIncluded = new Vector();
+ dirsNotIncluded = new Vector();
+ dirsExcluded = new Vector();
+ dirsDeselected = new Vector();
+
+ if ( isIncluded( "", tokenizedEmpty ) )
{
- if ( !isExcluded( "" ) )
+
+ if ( !isExcluded( "", tokenizedEmpty ) )
{
if ( isSelected( "", basedir ) )
{
@@ -337,7 +355,7 @@ public void scan() throws IllegalStateException
* list of excluded/included files/directories, whereas a fast scan
* will only have full results for included files, as it ignores
* directories which can't possibly hold any included files/directories.
- *
+ *
* Returns immediately if a slow scan has already been completed.
*/
protected void slowScan()
@@ -353,21 +371,19 @@ protected void slowScan()
String[] notIncl = new String[dirsNotIncluded.size()];
dirsNotIncluded.copyInto( notIncl );
- for ( int i = 0; i < excl.length; i++ )
+ for ( String anExcl : excl )
{
- if ( !couldHoldIncluded( excl[i] ) )
+ if ( !couldHoldIncluded( anExcl ) )
{
- scandir( new File( basedir, excl[i] ),
- excl[i] + File.separator, false );
+ scandir( new File( basedir, anExcl ), anExcl + File.separator, false );
}
}
- for ( int i = 0; i < notIncl.length; i++ )
+ for ( String aNotIncl : notIncl )
{
- if ( !couldHoldIncluded( notIncl[i] ) )
+ if ( !couldHoldIncluded( aNotIncl ) )
{
- scandir( new File( basedir, notIncl[i] ),
- notIncl[i] + File.separator, false );
+ scandir( new File( basedir, aNotIncl ), aNotIncl + File.separator, false );
}
}
@@ -385,8 +401,6 @@ protected void slowScan()
* prevent problems with an absolute path when using
* dir). Must not be null.
* @param fast Whether or not this call is part of a fast scan.
- * @throws IOException
- *
* @see #filesIncluded
* @see #filesNotIncluded
* @see #filesExcluded
@@ -409,15 +423,14 @@ protected void scandir( File dir, String vpath, boolean fast )
* then???)
*/
-
/*
- * [jdcasey] (2) is apparently happening to me, as this is killing one of my tests...
- * this is affecting the assembly plugin, fwiw. I will initialize the newfiles array as
- * zero-length for now.
- *
- * NOTE: I can't find the problematic code, as it appears to come from a native method
- * in UnixFileSystem...
- */
+ * [jdcasey] (2) is apparently happening to me, as this is killing one of my tests...
+ * this is affecting the assembly plugin, fwiw. I will initialize the newfiles array as
+ * zero-length for now.
+ *
+ * NOTE: I can't find the problematic code, as it appears to come from a native method
+ * in UnixFileSystem...
+ */
/*
* [bentmann] A null array will also be returned from list() on NTFS when dir refers to a soft link or
* junction point whose target is not existent.
@@ -429,15 +442,15 @@ protected void scandir( File dir, String vpath, boolean fast )
if ( !followSymlinks )
{
- Vector noLinks = new Vector();
- for ( int i = 0; i < newfiles.length; i++ )
+ ArrayList noLinks = new ArrayList();
+ for ( String newfile : newfiles )
{
try
{
- if ( isSymbolicLink( dir, newfiles[i] ) )
+ if ( isSymbolicLink( dir, newfile ) )
{
- String name = vpath + newfiles[i];
- File file = new File( dir, newfiles[i] );
+ String name = vpath + newfile;
+ File file = new File( dir, newfile );
if ( file.isDirectory() )
{
dirsExcluded.addElement( name );
@@ -449,31 +462,31 @@ protected void scandir( File dir, String vpath, boolean fast )
}
else
{
- noLinks.addElement( newfiles[i] );
+ noLinks.add( newfile );
}
}
catch ( IOException ioe )
{
- String msg = "IOException caught while checking "
- + "for links, couldn't get cannonical path!";
+ String msg = "IOException caught while checking " + "for links, couldn't get cannonical path!";
// will be caught and redirected to Ant's logging system
System.err.println( msg );
- noLinks.addElement( newfiles[i] );
+ noLinks.add( newfile );
}
}
- newfiles = new String[noLinks.size()];
- noLinks.copyInto( newfiles );
+ newfiles = noLinks.toArray(new String[noLinks.size()]);
}
- for ( int i = 0; i < newfiles.length; i++ )
+ for ( String newfile : newfiles )
{
- String name = vpath + newfiles[i];
- File file = new File( dir, newfiles[i] );
+ String name = vpath + newfile;
+ String[] tokenizedName = MatchPattern.tokenizePathToString( name, File.separator );
+ File file = new File( dir, newfile );
if ( file.isDirectory() )
{
- if ( isIncluded( name ) )
+
+ if ( isIncluded( name, tokenizedName ) )
{
- if ( !isExcluded( name ) )
+ if ( !isExcluded( name, tokenizedName ) )
{
if ( isSelected( name, file ) )
{
@@ -520,9 +533,9 @@ protected void scandir( File dir, String vpath, boolean fast )
}
else if ( file.isFile() )
{
- if ( isIncluded( name ) )
+ if ( isIncluded( name, tokenizedName ) )
{
- if ( !isExcluded( name ) )
+ if ( !isExcluded( name, tokenizedName ) )
{
if ( isSelected( name, file ) )
{
@@ -584,7 +597,6 @@ public String[] getIncludedFiles()
*
* @return the names of the files which matched none of the include
* patterns.
- *
* @see #slowScan
*/
public String[] getNotIncludedFiles()
@@ -603,7 +615,6 @@ public String[] getNotIncludedFiles()
*
* @return the names of the files which matched at least one of the
* include patterns and at at least one of the exclude patterns.
- *
* @see #slowScan
*/
public String[] getExcludedFiles()
@@ -617,12 +628,11 @@ public String[] getExcludedFiles()
/**
* Returns the names of the files which were selected out and
* therefore not ultimately included.
- *
+ *
* The names are relative to the base directory. This involves
* performing a slow scan if one has not already been completed.
*
* @return the names of the files which were deselected.
- *
* @see #slowScan
*/
public String[] getDeselectedFiles()
@@ -639,7 +649,7 @@ public String[] getDeselectedFiles()
* The names are relative to the base directory.
*
* @return the names of the directories which matched at least one of the
- * include patterns and none of the exclude patterns.
+ * include patterns and none of the exclude patterns.
*/
public String[] getIncludedDirectories()
{
@@ -654,8 +664,7 @@ public String[] getIncludedDirectories()
* performing a slow scan if one has not already been completed.
*
* @return the names of the directories which matched none of the include
- * patterns.
- *
+ * patterns.
* @see #slowScan
*/
public String[] getNotIncludedDirectories()
@@ -673,8 +682,7 @@ public String[] getNotIncludedDirectories()
* performing a slow scan if one has not already been completed.
*
* @return the names of the directories which matched at least one of the
- * include patterns and at least one of the exclude patterns.
- *
+ * include patterns and at least one of the exclude patterns.
* @see #slowScan
*/
public String[] getExcludedDirectories()
@@ -688,12 +696,11 @@ public String[] getExcludedDirectories()
/**
* Returns the names of the directories which were selected out and
* therefore not ultimately included.
- *
+ *
* The names are relative to the base directory. This involves
* performing a slow scan if one has not already been completed.
*
* @return the names of the directories which were deselected.
- *
* @see #slowScan
*/
public String[] getDeselectedDirectories()
@@ -706,19 +713,24 @@ public String[] getDeselectedDirectories()
/**
* Checks whether a given file is a symbolic link.
- *
+ *
* It doesn't really test for symbolic links but whether the
* canonical and absolute paths of the file are identical - this
* may lead to false positives on some platforms.
*
* @param parent the parent directory of the file to test
- * @param name the name of the file to test.
- *
+ * @param name the name of the file to test.
+ * @return true if it's a symbolic link
+ * @throws java.io.IOException .
* @since Ant 1.5
*/
public boolean isSymbolicLink( File parent, String name )
throws IOException
{
+ if ( Java7Detector.isJava7() )
+ {
+ return Java7FileUtil.isSymLink( new File( parent, name ) );
+ }
File resolvedParent = new File( parent.getCanonicalPath() );
File toTest = new File( resolvedParent, name );
return !toTest.getAbsolutePath().equals( toTest.getCanonicalPath() );
diff --git a/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java b/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java
index a3bb5e2c..a4af2527 100644
--- a/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java
+++ b/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java
@@ -19,8 +19,9 @@
import java.io.File;
/**
- * DirectoryWalkListener
+ * Observes the actions of a {@link DirectoryWalker}.
* @version $Id$
+ * @see DirectoryWalker
*/
public interface DirectoryWalkListener
{
diff --git a/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java b/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java
index 6f621b09..0d7c76cb 100644
--- a/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java
+++ b/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java
@@ -320,7 +320,7 @@ public void scan()
if ( debugEnabled )
{
Iterator it;
- StringBuffer dbg = new StringBuffer();
+ StringBuilder dbg = new StringBuilder();
dbg.append( "DirectoryWalker Scan" );
dbg.append( "\n Base Dir: " ).append( this.baseDir.getAbsolutePath() );
dbg.append( "\n Includes: " );
diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java
index 28743811..e1100162 100644
--- a/src/main/java/org/codehaus/plexus/util/FileUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/FileUtils.java
@@ -55,6 +55,9 @@
*
*/
+import org.codehaus.plexus.util.io.InputStreamFacade;
+import org.codehaus.plexus.util.io.URLInputStreamFacade;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -64,22 +67,18 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.net.URL;
+import java.nio.channels.FileChannel;
import java.security.SecureRandom;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.Random;
-import java.util.Vector;
-
-import org.codehaus.plexus.util.io.FileInputStreamFacade;
-import org.codehaus.plexus.util.io.InputStreamFacade;
-import org.codehaus.plexus.util.io.URLInputStreamFacade;
/**
* This class provides basic facilities for manipulating files and file paths.
@@ -140,14 +139,21 @@ public class FileUtils
*/
public static final int ONE_GB = ONE_KB * ONE_MB;
- /** The vm line separator */
+ /**
+ * The file copy buffer size (30 MB)
+ */
+ private static final long FILE_COPY_BUFFER_SIZE = ONE_MB * 30;
+
+ /**
+ * The vm file separator
+ */
public static String FS = System.getProperty( "file.separator" );
/**
* Non-valid Characters for naming files, folders under Windows: ":", "*", "?", "\"", "<", ">", "|"
*
* @see
- * http://support.microsoft.com/?scid=kb%3Ben-us%3B177506&x=12&y=13
+ * http://support.microsoft.com/?scid=kb%3Ben-us%3B177506&x=12&y=13
*/
private static final String[] INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME = { ":", "*", "?", "\"", "<", ">", "|" };
@@ -164,7 +170,7 @@ public static String[] getDefaultExcludes()
* @return the default excludes pattern as list.
* @see #getDefaultExcludes()
*/
- public static List getDefaultExcludesAsList()
+ public static List getDefaultExcludesAsList()
{
return Arrays.asList( getDefaultExcludes() );
}
@@ -252,7 +258,7 @@ public static String basename( String filename )
* Matches the equally named unix command.
*
* @param filename the file path
- * @param suffix the file suffix
+ * @param suffix the file suffix
* @return the basename of the file
*/
public static String basename( String filename, String suffix )
@@ -300,7 +306,7 @@ public static String extension( String filename )
}
}
- if ( lastDot >= 0 && lastDot > lastSep)
+ if ( lastDot >= 0 && lastDot > lastSep )
{
return filename.substring( lastDot + 1 );
}
@@ -334,7 +340,7 @@ public static String fileRead( String file )
}
/**
- * @param file the file path
+ * @param file the file path
* @param encoding the wanted encoding
* @return the file content using the specified encoding.
* @throws IOException if any
@@ -355,11 +361,11 @@ public static String fileRead( String file, String encoding )
public static String fileRead( File file )
throws IOException
{
- return fileRead( file, null);
+ return fileRead( file, null );
}
/**
- * @param file the file path
+ * @param file the file path
* @param encoding the wanted encoding
* @return the file content using the specified encoding.
* @throws IOException if any
@@ -367,7 +373,7 @@ public static String fileRead( File file )
public static String fileRead( File file, String encoding )
throws IOException
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
Reader reader = null;
@@ -401,13 +407,13 @@ public static String fileRead( File file, String encoding )
* Note: the data is written with platform encoding
*
* @param fileName The path of the file to write.
- * @param data The content to write to the file.
+ * @param data The content to write to the file.
* @throws IOException if any
*/
public static void fileAppend( String fileName, String data )
throws IOException
{
- fileAppend( fileName, null, data);
+ fileAppend( fileName, null, data );
}
/**
@@ -415,7 +421,7 @@ public static void fileAppend( String fileName, String data )
*
* @param fileName The path of the file to write.
* @param encoding The encoding of the file.
- * @param data The content to write to the file.
+ * @param data The content to write to the file.
* @throws IOException if any
*/
public static void fileAppend( String fileName, String encoding, String data )
@@ -425,7 +431,8 @@ public static void fileAppend( String fileName, String encoding, String data )
try
{
out = new FileOutputStream( fileName, true );
- if ( encoding != null ) {
+ if ( encoding != null )
+ {
out.write( data.getBytes( encoding ) );
}
else
@@ -444,7 +451,7 @@ public static void fileAppend( String fileName, String encoding, String data )
* Note: the data is written with platform encoding
*
* @param fileName The path of the file to write.
- * @param data The content to write to the file.
+ * @param data The content to write to the file.
* @throws IOException if any
*/
public static void fileWrite( String fileName, String data )
@@ -458,28 +465,60 @@ public static void fileWrite( String fileName, String data )
*
* @param fileName The path of the file to write.
* @param encoding The encoding of the file.
- * @param data The content to write to the file.
+ * @param data The content to write to the file.
* @throws IOException if any
*/
public static void fileWrite( String fileName, String encoding, String data )
throws IOException
{
- FileOutputStream out = null;
+ File file = ( fileName == null ) ? null : new File( fileName );
+ fileWrite( file, encoding, data );
+ }
+
+ /**
+ * Writes data to a file. The file will be created if it does not exist.
+ * Note: the data is written with platform encoding
+ *
+ * @param file The file to write.
+ * @param data The content to write to the file.
+ * @throws IOException if any
+ * @since 2.0.6
+ */
+ public static void fileWrite( File file, String data )
+ throws IOException
+ {
+ fileWrite( file, null, data );
+ }
+
+ /**
+ * Writes data to a file. The file will be created if it does not exist.
+ *
+ * @param file The file to write.
+ * @param encoding The encoding of the file.
+ * @param data The content to write to the file.
+ * @throws IOException if any
+ * @since 2.0.6
+ */
+ public static void fileWrite( File file, String encoding, String data )
+ throws IOException
+ {
+ Writer writer = null;
try
{
- out = new FileOutputStream( fileName );
+ OutputStream out = new FileOutputStream( file );
if ( encoding != null )
{
- out.write( data.getBytes( encoding ) );
+ writer = new OutputStreamWriter( out, encoding );
}
else
{
- out.write( data.getBytes() );
+ writer = new OutputStreamWriter( out );
}
+ writer.write( data );
}
finally
{
- IOUtil.close( out );
+ IOUtil.close( writer );
}
}
@@ -509,8 +548,8 @@ public static boolean waitFor( String fileName, int seconds )
/**
* Waits for NFS to propagate a file creation, imposing a timeout.
*
- * @param file The file.
- * @param seconds The maximum time in seconds to wait.
+ * @param file The file.
+ * @param seconds The maximum time in seconds to wait.
* @return True if file exists.
*/
public static boolean waitFor( File file, int seconds )
@@ -558,13 +597,13 @@ public static File getFile( String fileName )
*
* The given extensions should be like "java" and not like ".java"
*
- * @param directory The path of the directory.
+ * @param directory The path of the directory.
* @param extensions an array of expected extensions.
* @return An array of files for the wanted extensions.
*/
public static String[] getFilesFromExtension( String directory, String[] extensions )
{
- Vector files = new Vector();
+ List files = new ArrayList();
File currentDir = new File( directory );
@@ -601,14 +640,14 @@ public static String[] getFilesFromExtension( String directory, String[] extensi
String add = currentFile.getAbsolutePath();
if ( isValidFile( add, extensions ) )
{
- files.addElement( add );
+ files.add( add );
}
}
}
//ok... move the Vector into the files list...
String[] foundFiles = new String[files.size()];
- files.copyInto( foundFiles );
+ files.toArray( foundFiles );
return foundFiles;
}
@@ -616,11 +655,11 @@ public static String[] getFilesFromExtension( String directory, String[] extensi
/**
* Private helper method for getFilesFromExtension()
*/
- private static Vector blendFilesToVector( Vector v, String[] files )
+ private static List blendFilesToVector( List v, String[] files )
{
for ( int i = 0; i < files.length; ++i )
{
- v.addElement( files[i] );
+ v.add( files[i] );
}
return v;
@@ -665,14 +704,11 @@ public static void mkdir( String dir )
{
File file = new File( dir );
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) && !isValidWindowsFileName( file ) )
{
- if ( !isValidWindowsFileName( file ) )
- {
- throw new IllegalArgumentException( "The file (" + dir
- + ") cannot contain any of the following characters: \n"
- + StringUtils.join( INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME, " " ) );
- }
+ throw new IllegalArgumentException(
+ "The file (" + dir + ") cannot contain any of the following characters: \n" + StringUtils.join(
+ INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME, " " ) );
}
if ( !file.exists() )
@@ -788,9 +824,9 @@ public static URL[] toURLs( final File[] files )
*/
public static String removeExtension( final String filename )
{
- String ext = extension(filename);
+ String ext = extension( filename );
- if ( "".equals(ext) )
+ if ( "".equals( ext ) )
{
return filename;
}
@@ -813,7 +849,7 @@ public static String removeExtension( final String filename )
*/
public static String getExtension( final String filename )
{
- return extension(filename);
+ return extension( filename );
}
/**
@@ -840,7 +876,7 @@ public static String removePath( final String filepath )
* a.txt --> a.txt
*
*
- * @param filepath the path of the file
+ * @param filepath the path of the file
* @param fileSeparatorChar the file separator character like / on Unix plateforms.
* @return the filename minus path
*/
@@ -880,7 +916,7 @@ public static String getPath( final String filepath )
* a.txt --> ""
*
*
- * @param filepath the filepath
+ * @param filepath the filepath
* @param fileSeparatorChar the file separator character like / on Unix plateforms.
* @return the filename minus path
*/
@@ -1009,8 +1045,8 @@ public static void copyFile( final File source, final File destination )
//if they are equal, we can exit the method without doing any work
return;
}
-
- copyStreamToFile( new FileInputStreamFacade( source ), destination);
+ mkdirsFor( destination );
+ doCopyFile( source, destination );
if ( source.length() != destination.length() )
{
@@ -1019,19 +1055,48 @@ public static void copyFile( final File source, final File destination )
}
}
+ private static void doCopyFile( File source, File destination )
+ throws IOException
+ {
+ FileInputStream fis = null;
+ FileOutputStream fos = null;
+ FileChannel input = null;
+ FileChannel output = null;
+ try
+ {
+ fis = new FileInputStream( source );
+ fos = new FileOutputStream( destination );
+ input = fis.getChannel();
+ output = fos.getChannel();
+ long size = input.size();
+ long pos = 0;
+ long count = 0;
+ while ( pos < size )
+ {
+ count = size - pos > FILE_COPY_BUFFER_SIZE ? FILE_COPY_BUFFER_SIZE : size - pos;
+ pos += output.transferFrom( input, pos, count );
+ }
+ }
+ finally
+ {
+ IOUtil.close( output );
+ IOUtil.close( fos );
+ IOUtil.close( input );
+ IOUtil.close( fis );
+ }
+ }
+
/**
* Copy file from source to destination only if source timestamp is later than the destination timestamp.
* The directories up to destination will be created if they don't already exist.
* destination will be overwritten if it already exists.
*
- * @param source An existing non-directory File to copy bytes from.
+ * @param source An existing non-directory File to copy bytes from.
* @param destination A non-directory File to write bytes to (possibly
- * overwriting).
+ * overwriting).
* @return true if no problem occured
* @throws IOException if source does not exist, destination cannot be
- * written to, or an IO error occurs during copying.
- * @throws FileNotFoundException if destination is a directory
- * (use {@link #copyFileToDirectory}).
+ * written to, or an IO error occurs during copying.
*/
public static boolean copyFileIfModified( final File source, final File destination )
throws IOException
@@ -1051,20 +1116,20 @@ public static boolean copyFileIfModified( final File source, final File destinat
* The directories up to destination will be created if they don't already exist.
* destination will be overwritten if it already exists.
*
- * @param source A URL to copy bytes from.
+ * @param source A URL to copy bytes from.
* @param destination A non-directory File to write bytes to (possibly
- * overwriting).
+ * overwriting).
* @throws IOException if
- * source URL cannot be openeddestination cannot be written tosource URL cannot be openeddestination cannot be written todestination will be created if they don't already exist.
* destination will be overwritten if it already exists.
*
- * @param source An {@link InputStream} to copy bytes from. This stream is
- * guaranteed to be closed.
+ * @param source An {@link InputStream} to copy bytes from. This stream is
+ * guaranteed to be closed.
* @param destination A non-directory File to write bytes to (possibly
- * overwriting).
+ * overwriting).
* @throws IOException if
- * source URL cannot be openeddestination cannot be written tosource URL cannot be openeddestination cannot be written tonull if the ..'s went past the
@@ -1188,7 +1264,7 @@ public static String normalize( final String path )
* Thieved from Tomcat sources...
*
* @param lookupPath a path
- * @param path the path to concatenate
+ * @param path the path to concatenate
* @return The concatenated paths, or null if error occurs
*/
public static String catPath( final String lookupPath, final String path )
@@ -1225,7 +1301,7 @@ public static String catPath( final String lookupPath, final String path )
* baseFile, otherwise it is treated as a normal root-relative path.
*
* @param baseFile Where to resolve filename from, if filename is
- * relative.
+ * relative.
* @param filename Absolute or relative file path to resolve.
* @return The canonical File of filename.
*/
@@ -1261,7 +1337,7 @@ public static File resolveFile( final File baseFile, String filename )
// FIXME: I'm almost certain this // removal is unnecessary, as getAbsoluteFile() strips
// them. However, I'm not sure about this UNC stuff. (JT)
final char[] chars = filename.toCharArray();
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
//remove duplicate file separators in succession - except
//on win32 at start of filename as UNC filenames can
@@ -1406,7 +1482,7 @@ public static void forceDeleteOnExit( final File file )
/**
* Recursively schedule directory for deletion on JVM exit.
*
- * @param file a directory
+ * @param directory a directory
* @throws IOException if any
*/
private static void deleteDirectoryOnExit( final File directory )
@@ -1416,15 +1492,15 @@ private static void deleteDirectoryOnExit( final File directory )
{
return;
}
+ directory.deleteOnExit(); // The hook reverses the list
cleanDirectoryOnExit( directory );
- directory.deleteOnExit();
}
/**
* Clean a directory without deleting it.
*
- * @param file a directory
+ * @param directory a directory
* @throws IOException if any
*/
private static void cleanDirectoryOnExit( final File directory )
@@ -1469,8 +1545,8 @@ private static void cleanDirectoryOnExit( final File directory )
* Make a directory.
*
* @param file not null
- * @throws IOException If there already exists a file with specified name or
- * the directory is unable to be created
+ * @throws IOException If there already exists a file with specified name or
+ * the directory is unable to be created
* @throws IllegalArgumentException if the file contains illegal Windows characters under Windows OS.
* @see #INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME
*/
@@ -1481,9 +1557,9 @@ public static void forceMkdir( final File file )
{
if ( !isValidWindowsFileName( file ) )
{
- throw new IllegalArgumentException( "The file (" + file.getAbsolutePath()
- + ") cannot contain any of the following characters: \n"
- + StringUtils.join( INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME, " " ) );
+ throw new IllegalArgumentException(
+ "The file (" + file.getAbsolutePath() + ") cannot contain any of the following characters: \n"
+ + StringUtils.join( INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME, " " ) );
}
}
@@ -1532,6 +1608,14 @@ public static void deleteDirectory( final File directory )
return;
}
+ /* try delete the directory before its contents, which will take
+ * care of any directories that are really symbolic links.
+ */
+ if ( directory.delete() )
+ {
+ return;
+ }
+
cleanDirectory( directory );
if ( !directory.delete() )
{
@@ -1657,13 +1741,13 @@ public static long sizeOfDirectory( final File directory )
* including the directory name in each of the files
*
* @param directory the directory to scan
- * @param includes the includes pattern, comma separated
- * @param excludes the excludes pattern, comma separated
+ * @param includes the includes pattern, comma separated
+ * @param excludes the excludes pattern, comma separated
* @return a list of File objects
* @throws IOException
- * @see #getFileNames( File, String, String, boolean )
+ * @see #getFileNames(File, String, String, boolean)
*/
- public static List getFiles( File directory, String includes, String excludes )
+ public static ListsourceDirectory must exists.
*
*
- * @param sourceDirectory the source dir
+ * @param sourceDirectory the source dir
* @param destinationDirectory the target dir
- * @param includes include pattern
- * @param excludes exlucde pattern
- * @since 1.5.7
+ * @param includes include pattern
+ * @param excludes exlucde pattern
* @throws IOException if any
+ * @since 1.5.7
*/
public static void copyDirectoryLayout( File sourceDirectory, File destinationDirectory, String[] includes,
- String[] excludes )
+ String[] excludes )
throws IOException
{
if ( sourceDirectory == null )
@@ -1932,7 +2015,7 @@ public static void copyDirectoryLayout( File sourceDirectory, File destinationDi
}
else
{
- scanner.setIncludes( new String[] { "**" } );
+ scanner.setIncludes( new String[]{ "**" } );
}
if ( excludes != null && excludes.length >= 1 )
@@ -1942,20 +2025,18 @@ public static void copyDirectoryLayout( File sourceDirectory, File destinationDi
scanner.addDefaultExcludes();
scanner.scan();
- List includedDirectories = Arrays.asList( scanner.getIncludedDirectories() );
+ ListsourceDirectory must exists.
*
*
- * @param sourceDirectory the source dir
+ * @param sourceDirectory the source dir
* @param destinationDirectory the target dir
* @throws IOException if any
*/
@@ -1988,7 +2069,7 @@ public static void copyDirectoryStructure( File sourceDirectory, File destinatio
* sourceDirectory must exists.
*
*
- * @param sourceDirectory the source dir
+ * @param sourceDirectory the source dir
* @param destinationDirectory the target dir
* @throws IOException if any
*/
@@ -2083,7 +2164,7 @@ else if ( file.isDirectory() )
* @param from the file to move
* @param to the new file name
* @throws IOException if anything bad happens during this process.
- * Note that to may have been deleted already when this happens.
+ * Note that to may have been deleted already when this happens.
*/
public static void rename( File from, File to )
throws IOException
@@ -2126,10 +2207,10 @@ public static void rename( File from, File to )
* To delete automatically the file created by this method, use the * {@link File#deleteOnExit()} method.
* - * @param prefix prefix before the random number - * @param suffix file extension; include the '.' + * @param prefix prefix before the random number + * @param suffix file extension; include the '.' * @param parentDir Directory to create the temporary file in-java.io.tmpdir
- * used if not specificed
+ * used if not specificed
* @return a File reference to the new temporary file.
*/
public static File createTempFile( String prefix, String suffix, File parentDir )
@@ -2158,8 +2239,9 @@ public static File createTempFile( String prefix, String suffix, File parentDir
/**
* If wrappers is null or empty, the file will be copy only if to.lastModified() < from.lastModified()
- * @param from the file to copy
- * @param to the destination file
+ *
+ * @param from the file to copy
+ * @param to the destination file
* @param encoding the file output encoding (only if wrappers is not empty)
* @param wrappers array of {@link FilterWrapper}
* @throws IOException if an IO error occurs during copying or filtering
@@ -2177,12 +2259,13 @@ public static abstract class FilterWrapper
/**
* If wrappers is null or empty, the file will be copy only if to.lastModified() < from.lastModified() or if overwrite is true
- * @param from the file to copy
- * @param to the destination file
- * @param encoding the file output encoding (only if wrappers is not empty)
- * @param wrappers array of {@link FilterWrapper}
+ *
+ * @param from the file to copy
+ * @param to the destination file
+ * @param encoding the file output encoding (only if wrappers is not empty)
+ * @param wrappers array of {@link FilterWrapper}
* @param overwrite if true and f wrappers is null or empty, the file will be copy
- * enven if to.lastModified() < from.lastModified()
+ * enven if to.lastModified() < from.lastModified()
* @throws IOException if an IO error occurs during copying or filtering
* @since 1.5.2
*/
@@ -2243,10 +2326,10 @@ public static void copyFile( File from, File to, String encoding, FilterWrapper[
* @return a List containing every every line not starting with # and not empty
* @throws IOException if any
*/
- public static List loadFile( File file )
+ public static Listfalse if the file path contains any of forbidden Windows characters,
- * true if the Os is not Windows or if the file path respect the Windows constraints.
+ * true if the Os is not Windows or if the file path respect the Windows constraints.
* @see #INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME
* @since 1.5.2
*/
@@ -2290,9 +2373,10 @@ public static boolean isValidWindowsFileName( File f )
return false;
}
- if ( f.getParentFile()!= null)
+ File parentFile = f.getParentFile();
+ if ( parentFile != null )
{
- return isValidWindowsFileName( f.getParentFile() );
+ return isValidWindowsFileName( parentFile );
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/IOUtil.java b/src/main/java/org/codehaus/plexus/util/IOUtil.java
index 20cab90d..4045a7f4 100644
--- a/src/main/java/org/codehaus/plexus/util/IOUtil.java
+++ b/src/main/java/org/codehaus/plexus/util/IOUtil.java
@@ -67,6 +67,7 @@
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
+import java.nio.channels.Channel;
/**
* General IO Stream manipulation.
@@ -152,7 +153,7 @@
public final class IOUtil
{
- private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
+ private static final int DEFAULT_BUFFER_SIZE = 1024 * 16;
/**
* Private constructor to prevent instantiation.
@@ -745,6 +746,28 @@ public static void close( InputStream inputStream )
}
}
+ /**
+ * Closes a channel. Channel can be null and any IOException's will be swallowed.
+ *
+ * @param channel The stream to close.
+ */
+ public static void close( Channel channel )
+ {
+ if ( channel == null )
+ {
+ return;
+ }
+
+ try
+ {
+ channel.close();
+ }
+ catch( IOException ex )
+ {
+ // ignore
+ }
+ }
+
/**
* Closes the output stream. The output stream can be null and any IOException's will be swallowed.
*
diff --git a/src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java b/src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java
index 8eec7e44..d765c0d5 100644
--- a/src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java
+++ b/src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java
@@ -61,6 +61,25 @@
import java.util.Map;
/**
+ * A FilterReader which interpolates keyword values into a character stream.
+ * Keywords are recognized when enclosed between starting and ending delimiter
+ * strings. The keywords themselves, and their values, are fetched from a Map
+ * supplied to the constructor.
+ * + * When a possible keyword token is recognized (by detecting the starting and + * ending token delimiters): + *
+ *+ * When a possible keyword token is recognized (by detecting the starting and + * ending token delimiters): + *
+ *+ * A token in the incoming character stream may be escaped by + * prepending an "escape sequence" which is specified to the constructor. An + * escaped token is passed through as written, with the escape sequence removed. + * This allows things which would look like tokens to be read literally rather + * than interpolated. + *
+ * * @author jdcasey Created on Feb 3, 2005 + * + * @see InterpolationFilterReader + * @see org.codehaus.plexus.interpolation */ public class LineOrientedInterpolatingReader extends FilterReader @@ -48,7 +75,7 @@ public class LineOrientedInterpolatingReader private final PushbackReader pushbackReader; - private final Map context; + private final Mapbasedir is null or zero-length,
- * or filename is null or zero-length.
+ * directory. This value is not terminated with a forward slash.
+ * A zero-length string is returned if: the filename is not relative to
+ * the base directory, basedir is null or zero-length,
+ * or filename is null or zero-length.
*/
public static final String getRelativePath( String basedir, String filename )
{
- basedir = uppercaseDrive(basedir);
- filename = uppercaseDrive(filename);
+ basedir = uppercaseDrive( basedir );
+ filename = uppercaseDrive( filename );
/*
* Verify the arguments and make sure the filename is relative
* to the base directory.
*/
- if ( basedir == null || basedir.length() == 0 || filename == null
- || filename.length() == 0 || !filename.startsWith( basedir ) )
+ if ( basedir == null || basedir.length() == 0 || filename == null || filename.length() == 0
+ || !filename.startsWith( basedir ) )
{
return "";
}
@@ -108,13 +108,13 @@ public static final String getRelativePath( String basedir, String filename )
*
* @param filename The filename to be parsed.
* @return The relative path of the filename. This value is not
- * terminated with a forward slash. A zero-length string is
- * returned if: filename is null or zero-length.
+ * terminated with a forward slash. A zero-length string is
+ * returned if: filename is null or zero-length.
* @see #getRelativeFilePath(String, String)
*/
public static final String getRelativePath( String filename )
{
- filename = uppercaseDrive(filename);
+ filename = uppercaseDrive( filename );
if ( filename == null || filename.length() == 0 )
{
@@ -155,8 +155,8 @@ public static final String getRelativePath( String filename )
*
* @param filename The filename to be parsed.
* @return The directory portion of the filename. If
- * the filename does not contain a directory component, "." is
- * returned.
+ * the filename does not contain a directory component, "." is
+ * returned.
*/
public static final String getDirectoryComponent( String filename )
{
@@ -191,44 +191,52 @@ public static final String getDirectoryComponent( String filename )
* @param relativePath
* @return String
*/
- public static final String calculateLink(String link, String relativePath)
+ public static final String calculateLink( String link, String relativePath )
{
+ if ( link == null )
+ {
+ link = "";
+ }
+ if ( relativePath == null )
+ {
+ relativePath = "";
+ }
//This must be some historical feature
- if (link.startsWith("/site/"))
+ if ( link.startsWith( "/site/" ) )
{
- return link.substring(5);
+ return link.substring( 5 );
}
//Allows absolute links in nav-bars etc
- if (link.startsWith("/absolute/"))
+ if ( link.startsWith( "/absolute/" ) )
{
- return link.substring(10);
+ return link.substring( 10 );
}
// This traps urls like http://
- if (link.indexOf(":") >= 0)
+ if ( link.indexOf( ":" ) >= 0 )
{
return link;
}
//If relativepath is current directory, just pass the link through
- if (relativePath.equals("."))
+ if ( StringUtils.equals( relativePath, "." ) )
{
- if (link.startsWith("/"))
+ if ( link.startsWith( "/" ) )
{
- return link.substring(1);
+ return link.substring( 1 );
}
return link;
}
//If we don't do this, you can end up with ..//bob.html rather than ../bob.html
- if (relativePath.endsWith("/") && link.startsWith("/"))
+ if ( relativePath.endsWith( "/" ) && link.startsWith( "/" ) )
{
- return relativePath + "." + link.substring(1);
+ return relativePath + "." + link.substring( 1 );
}
- if (relativePath.endsWith("/") || link.startsWith("/"))
+ if ( relativePath.endsWith( "/" ) || link.startsWith( "/" ) )
{
return relativePath + link;
}
@@ -324,16 +332,16 @@ public static final String getRelativeFilePath( final String oldPath, final Stri
// check for the presence of windows drives. No relative way of
// traversing from one to the other.
- if ( ( toPath.startsWith( ":", 1 ) && fromPath.startsWith( ":", 1 ) )
- && ( !toPath.substring( 0, 1 ).equals( fromPath.substring( 0, 1 ) ) ) )
+ if ( ( toPath.startsWith( ":", 1 ) && fromPath.startsWith( ":", 1 ) ) && ( !toPath.substring( 0, 1 ).equals(
+ fromPath.substring( 0, 1 ) ) ) )
{
// they both have drive path element but they dont match, no
// relative path
return null;
}
- if ( ( toPath.startsWith( ":", 1 ) && !fromPath.startsWith( ":", 1 ) )
- || ( !toPath.startsWith( ":", 1 ) && fromPath.startsWith( ":", 1 ) ) )
+ if ( ( toPath.startsWith( ":", 1 ) && !fromPath.startsWith( ":", 1 ) ) || ( !toPath.startsWith( ":", 1 )
+ && fromPath.startsWith( ":", 1 ) ) )
{
// one has a drive path element and the other doesnt, no relative
// path.
@@ -359,26 +367,24 @@ public static final String getRelativeFilePath( final String oldPath, final Stri
* within the filename (except the leading if present), append the
* "../" string to the return value.
*
- * @param filename The filename to parse.
+ * @param filename The filename to parse.
* @param separator The separator used within the filename.
* @return The relative path of the filename. This value is not
- * terminated with a forward slash. A zero-length string is
- * returned if: the filename is zero-length.
+ * terminated with a forward slash. A zero-length string is
+ * returned if: the filename is zero-length.
*/
- private static final String determineRelativePath( String filename,
- String separator )
+ private static final String determineRelativePath( String filename, String separator )
{
if ( filename.length() == 0 )
{
return "";
}
-
/*
- * Count the slashes in the relative filename, but exclude the
- * leading slash. If the path has no slashes, then the filename
- * is relative to the current directory.
- */
+ * Count the slashes in the relative filename, but exclude the
+ * leading slash. If the path has no slashes, then the filename
+ * is relative to the current directory.
+ */
int slashCount = StringUtils.countMatches( filename, separator ) - 1;
if ( slashCount <= 0 )
{
@@ -390,7 +396,7 @@ private static final String determineRelativePath( String filename,
* that the file is within one or more directories. Thus, each
* slash represents a "../" in the relative path.
*/
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for ( int i = 0; i < slashCount; i++ )
{
sb.append( "../" );
@@ -409,9 +415,9 @@ private static final String determineRelativePath( String filename,
* often is returned as the separator.
*
* @param filename The filename parsed to determine the file
- * separator.
+ * separator.
* @return The file separator used within filename.
- * This value is either a forward or backward slash.
+ * This value is either a forward or backward slash.
*/
private static final String determineSeparator( String filename )
{
@@ -423,23 +429,24 @@ private static final String determineSeparator( String filename )
/**
* Cygwin prefers lowercase drive letters, but other parts of maven use uppercase
+ *
* @param path
* @return String
*/
- static final String uppercaseDrive(String path)
+ static final String uppercaseDrive( String path )
{
- if (path == null)
+ if ( path == null )
{
return null;
}
- if (path.length() >= 2 && path.charAt(1) == ':')
+ if ( path.length() >= 2 && path.charAt( 1 ) == ':' )
{
path = Character.toUpperCase( path.charAt( 0 ) ) + path.substring( 1 );
}
return path;
}
- private static final String buildRelativePath( String toPath, String fromPath, final char separatorChar )
+ private static final String buildRelativePath( String toPath, String fromPath, final char separatorChar )
{
// use tokeniser to traverse paths and for lazy checking
StringTokenizer toTokeniser = new StringTokenizer( toPath, String.valueOf( separatorChar ) );
diff --git a/src/main/java/org/codehaus/plexus/util/PropertyUtils.java b/src/main/java/org/codehaus/plexus/util/PropertyUtils.java
index f327fd8a..0ed1aa48 100644
--- a/src/main/java/org/codehaus/plexus/util/PropertyUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/PropertyUtils.java
@@ -24,7 +24,7 @@
import java.net.URL;
/**
- *
+ * Static methods to create Properties loaded from various sources.
*
* @author Jason van Zyl
* @author Michal Maczka
diff --git a/src/main/java/org/codehaus/plexus/util/ReaderFactory.java b/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
index c9fe9927..8eddfdf9 100644
--- a/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
+++ b/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
@@ -190,6 +190,8 @@ public static Reader newReader( InputStream in, String encoding )
/**
* Create a new Reader with specified encoding.
*
+ * Note that there is no buffering on this reader, which favours clients that read into large buffers (8K+).
+ *
* @param file not null file.
* @param encoding not null supported encoding.
* @return a reader instance for the input file using the given encoding.
diff --git a/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java b/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
index f19d4e19..53b2a24f 100644
--- a/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
@@ -27,6 +27,8 @@
import java.util.Arrays;
/**
+ * Operations on a class' fields and their setters.
+ *
* @author Michal Maczka
* @author Jesse McConnell
* @author Trygve Laugstøl
@@ -38,7 +40,7 @@ public final class ReflectionUtils
// Field utils
// ----------------------------------------------------------------------
- public static Field getFieldByNameIncludingSuperclasses( String fieldName, Class clazz )
+ public static Field getFieldByNameIncludingSuperclasses( String fieldName, Class clazz )
{
Field retValue = null;
@@ -48,7 +50,7 @@ public static Field getFieldByNameIncludingSuperclasses( String fieldName, Class
}
catch ( NoSuchFieldException e )
{
- Class superclass = clazz.getSuperclass();
+ Class superclass = clazz.getSuperclass();
if ( superclass != null )
{
@@ -59,11 +61,11 @@ public static Field getFieldByNameIncludingSuperclasses( String fieldName, Class
return retValue;
}
- public static List getFieldsIncludingSuperclasses( Class clazz )
+ public static ListThis is a utility class used by selectors and DirectoryScanner. The @@ -67,23 +68,23 @@ *
This is a Singleton.
* * @author Arnout J. Kuiper - * ajkuiper@wxs.nl + * ajkuiper@wxs.nl * @author Magesh Umasankar * @author Bruce Atherton - * @since 1.5 * @version $Id$ + * @since 1.5 */ public final class SelectorUtils { public static final String PATTERN_HANDLER_PREFIX = "["; - + public static final String PATTERN_HANDLER_SUFFIX = "]"; - + public static final String REGEX_HANDLER_PREFIX = "%regex" + PATTERN_HANDLER_PREFIX; - + public static final String ANT_HANDLER_PREFIX = "%ant" + PATTERN_HANDLER_PREFIX; - + private static SelectorUtils instance = new SelectorUtils(); /** @@ -104,7 +105,7 @@ public static SelectorUtils getInstance() /** * Tests whether or not a given path matches the start of a given * pattern up to the first "**". - *+ *
* This is not a general purpose test and should only be used if you * can live with false positives. For example,pattern=**\a
* and str=b will yield true.
@@ -113,9 +114,8 @@ public static SelectorUtils getInstance()
* null.
* @param str The path to match, as a String. Must not be
* null.
- *
* @return whether or not a given path matches the start of a given
- * pattern up to the first "**".
+ * pattern up to the first "**".
*/
public static boolean matchPatternStart( String pattern, String str )
{
@@ -125,26 +125,23 @@ public static boolean matchPatternStart( String pattern, String str )
/**
* Tests whether or not a given path matches the start of a given
* pattern up to the first "**".
- * + *
* This is not a general purpose test and should only be used if you * can live with false positives. For example,pattern=**\a
* and str=b will yield true.
*
- * @param pattern The pattern to match against. Must not be
- * null.
- * @param str The path to match, as a String. Must not be
- * null.
+ * @param pattern The pattern to match against. Must not be
+ * null.
+ * @param str The path to match, as a String. Must not be
+ * null.
* @param isCaseSensitive Whether or not matching should be performed
* case sensitively.
- *
* @return whether or not a given path matches the start of a given
- * pattern up to the first "**".
+ * pattern up to the first "**".
*/
- public static boolean matchPatternStart( String pattern, String str,
- boolean isCaseSensitive )
+ public static boolean matchPatternStart( String pattern, String str, boolean isCaseSensitive )
{
- if ( pattern.length() > ( REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
- && pattern.startsWith( REGEX_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX ) )
+ if ( isRegexPrefixedPattern( pattern ) )
{
// FIXME: ICK! But we can't do partial matches for regex, so we have to reserve judgement until we have
// a file to deal with, or we can definitely say this is an exclusion...
@@ -152,50 +149,85 @@ public static boolean matchPatternStart( String pattern, String str,
}
else
{
- if ( pattern.length() > ( ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
- && pattern.startsWith( ANT_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX ) )
+ if ( isAntPrefixedPattern( pattern ) )
{
- pattern =
- pattern.substring( ANT_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
+ pattern = pattern.substring( ANT_HANDLER_PREFIX.length(),
+ pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
}
String altStr = str.replace( '\\', '/' );
-
+
return matchAntPathPatternStart( pattern, str, File.separator, isCaseSensitive )
|| matchAntPathPatternStart( pattern, altStr, "/", isCaseSensitive );
}
}
-
- private static boolean matchAntPathPatternStart( String pattern, String str, String separator, boolean isCaseSensitive )
+
+ static boolean isAntPrefixedPattern( String pattern )
+ {
+ return pattern.length() > ( ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
+ && pattern.startsWith( ANT_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX );
+ }
+
+ @SuppressWarnings( "SimplifiableIfStatement" )
+ static boolean matchAntPathPatternStart( MatchPattern pattern, String str, String separator,
+ boolean isCaseSensitive )
+ {
+ if ( separatorPatternStartSlashMismatch( pattern, str, separator ) )
+ {
+ return false;
+ }
+
+ return matchAntPathPatternStart( pattern.getTokenizedPathString(), str, separator, isCaseSensitive );
+ }
+
+ static boolean matchAntPathPatternStart( String pattern, String str, String separator, boolean isCaseSensitive )
{
// When str starts with a File.separator, pattern has to start with a
// File.separator.
// When pattern starts with a File.separator, str has to start with a
// File.separator.
- if ( str.startsWith( separator ) !=
- pattern.startsWith( separator ) )
+ if ( separatorPatternStartSlashMismatch( pattern, str, separator ) )
{
return false;
}
- Vector patDirs = tokenizePath( pattern, separator );
- Vector strDirs = tokenizePath( str, separator );
+ String[] patDirs = tokenizePathToString( pattern, separator );
+ return matchAntPathPatternStart( patDirs, str, separator, isCaseSensitive );
+ }
+
+ // When str starts with a File.separator, pattern has to start with a
+ // File.separator.
+ // When pattern starts with a File.separator, str has to start with a
+ // File.separator.
+ private static boolean separatorPatternStartSlashMismatch( String pattern, String str, String separator )
+ {
+ return str.startsWith( separator ) != pattern.startsWith( separator );
+ }
+
+ private static boolean separatorPatternStartSlashMismatch( MatchPattern matchPattern, String str, String separator )
+ {
+ return str.startsWith( separator ) != matchPattern.startsWith( separator );
+ }
+
+
+ static boolean matchAntPathPatternStart( String[] patDirs, String str, String separator, boolean isCaseSensitive )
+ {
+ String[] strDirs = tokenizePathToString( str, separator );
int patIdxStart = 0;
- int patIdxEnd = patDirs.size() - 1;
+ int patIdxEnd = patDirs.length - 1;
int strIdxStart = 0;
- int strIdxEnd = strDirs.size() - 1;
+ int strIdxEnd = strDirs.length - 1;
// up to first '**'
while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
{
- String patDir = (String) patDirs.elementAt( patIdxStart );
+ String patDir = patDirs[patIdxStart];
if ( patDir.equals( "**" ) )
{
break;
}
- if ( !match( patDir, (String) strDirs.elementAt( strIdxStart ),
- isCaseSensitive ) )
+ if ( !match( patDir, strDirs[strIdxStart], isCaseSensitive ) )
{
return false;
}
@@ -203,22 +235,7 @@ private static boolean matchAntPathPatternStart( String pattern, String str, Str
strIdxStart++;
}
- if ( strIdxStart > strIdxEnd )
- {
- // String is exhausted
- return true;
- }
- else if ( patIdxStart > patIdxEnd )
- {
- // String not exhausted, but pattern is. Failure.
- return false;
- }
- else
- {
- // pattern now holds ** while string is not exhausted
- // this will generate false positives but we can live with that.
- return true;
- }
+ return strIdxStart > strIdxEnd || patIdxStart <= patIdxEnd;
}
/**
@@ -228,7 +245,6 @@ else if ( patIdxStart > patIdxEnd )
* null.
* @param str The path to match, as a String. Must not be
* null.
- *
* @return true if the pattern matches against the string,
* or false otherwise.
*/
@@ -240,73 +256,88 @@ public static boolean matchPath( String pattern, String str )
/**
* Tests whether or not a given path matches a given pattern.
*
- * @param pattern The pattern to match against. Must not be
- * null.
- * @param str The path to match, as a String. Must not be
- * null.
+ * @param pattern The pattern to match against. Must not be
+ * null.
+ * @param str The path to match, as a String. Must not be
+ * null.
* @param isCaseSensitive Whether or not matching should be performed
* case sensitively.
- *
* @return true if the pattern matches against the string,
* or false otherwise.
*/
- public static boolean matchPath( String pattern, String str,
- boolean isCaseSensitive )
+ public static boolean matchPath( String pattern, String str, boolean isCaseSensitive )
+ {
+ return matchPath( pattern, str, File.separator, isCaseSensitive );
+ }
+
+ public static boolean matchPath( String pattern, String str, String separator, boolean isCaseSensitive )
{
- if ( pattern.length() > ( REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
- && pattern.startsWith( REGEX_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX ) )
+ if ( isRegexPrefixedPattern( pattern ) )
{
- pattern = pattern.substring( REGEX_HANDLER_PREFIX.length(), pattern.length()
- - PATTERN_HANDLER_SUFFIX.length() );
+ pattern =
+ pattern.substring( REGEX_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
return str.matches( pattern );
}
else
{
- if ( pattern.length() > ( ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
- && pattern.startsWith( ANT_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX ) )
+ if ( isAntPrefixedPattern( pattern ) )
{
- pattern =
- pattern.substring( ANT_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
+ pattern = pattern.substring( ANT_HANDLER_PREFIX.length(),
+ pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
}
-
- return matchAntPathPattern( pattern, str, isCaseSensitive );
+
+ return matchAntPathPattern( pattern, str, separator, isCaseSensitive );
}
}
- private static boolean matchAntPathPattern( String pattern, String str, boolean isCaseSensitive )
+ static boolean isRegexPrefixedPattern( String pattern )
{
- // When str starts with a File.separator, pattern has to start with a
- // File.separator.
- // When pattern starts with a File.separator, str has to start with a
- // File.separator.
- if ( str.startsWith( File.separator ) !=
- pattern.startsWith( File.separator ) )
+ return pattern.length() > ( REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
+ && pattern.startsWith( REGEX_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX );
+ }
+
+ static boolean matchAntPathPattern( MatchPattern matchPattern, String str, String separator,
+ boolean isCaseSensitive )
+ {
+ if ( separatorPatternStartSlashMismatch( matchPattern, str, separator ) )
+ {
+ return false;
+ }
+ String[] patDirs = matchPattern.getTokenizedPathString();
+ String[] strDirs = tokenizePathToString( str, separator );
+ return matchAntPathPattern( patDirs, strDirs, isCaseSensitive );
+ }
+
+ static boolean matchAntPathPattern( String pattern, String str, String separator, boolean isCaseSensitive )
+ {
+ if ( separatorPatternStartSlashMismatch( pattern, str, separator ) )
{
return false;
}
+ String[] patDirs = tokenizePathToString( pattern, separator );
+ String[] strDirs = tokenizePathToString( str, separator );
+ return matchAntPathPattern( patDirs, strDirs, isCaseSensitive );
- Vector patDirs = tokenizePath( pattern, File.separator );
- Vector strDirs = tokenizePath( str, File.separator );
+ }
+ static boolean matchAntPathPattern( String[] patDirs, String[] strDirs, boolean isCaseSensitive )
+ {
int patIdxStart = 0;
- int patIdxEnd = patDirs.size() - 1;
+ int patIdxEnd = patDirs.length - 1;
int strIdxStart = 0;
- int strIdxEnd = strDirs.size() - 1;
+ int strIdxEnd = strDirs.length - 1;
// up to first '**'
while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
{
- String patDir = (String) patDirs.elementAt( patIdxStart );
+ String patDir = patDirs[patIdxStart];
if ( patDir.equals( "**" ) )
{
break;
}
- if ( !match( patDir, (String) strDirs.elementAt( strIdxStart ),
- isCaseSensitive ) )
+ if ( !match( patDir, strDirs[strIdxStart], isCaseSensitive ) )
{
- patDirs = null;
- strDirs = null;
return false;
}
patIdxStart++;
@@ -317,10 +348,8 @@ private static boolean matchAntPathPattern( String pattern, String str, boolean
// String is exhausted
for ( int i = patIdxStart; i <= patIdxEnd; i++ )
{
- if ( !patDirs.elementAt( i ).equals( "**" ) )
+ if ( !patDirs[i].equals( "**" ) )
{
- patDirs = null;
- strDirs = null;
return false;
}
}
@@ -331,8 +360,6 @@ private static boolean matchAntPathPattern( String pattern, String str, boolean
if ( patIdxStart > patIdxEnd )
{
// String not exhausted, but pattern is. Failure.
- patDirs = null;
- strDirs = null;
return false;
}
}
@@ -340,16 +367,143 @@ private static boolean matchAntPathPattern( String pattern, String str, boolean
// up to last '**'
while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
{
- String patDir = (String) patDirs.elementAt( patIdxEnd );
+ String patDir = patDirs[patIdxEnd];
if ( patDir.equals( "**" ) )
{
break;
}
- if ( !match( patDir, (String) strDirs.elementAt( strIdxEnd ),
- isCaseSensitive ) )
+ if ( !match( patDir, strDirs[strIdxEnd], isCaseSensitive ) )
+ {
+ return false;
+ }
+ patIdxEnd--;
+ strIdxEnd--;
+ }
+ if ( strIdxStart > strIdxEnd )
+ {
+ // String is exhausted
+ for ( int i = patIdxStart; i <= patIdxEnd; i++ )
+ {
+ if ( !patDirs[i].equals( "**" ) )
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ while ( patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd )
+ {
+ int patIdxTmp = -1;
+ for ( int i = patIdxStart + 1; i <= patIdxEnd; i++ )
+ {
+ if ( patDirs[i].equals( "**" ) )
+ {
+ patIdxTmp = i;
+ break;
+ }
+ }
+ if ( patIdxTmp == patIdxStart + 1 )
+ {
+ // '**/**' situation, so skip one
+ patIdxStart++;
+ continue;
+ }
+ // Find the pattern between padIdxStart & padIdxTmp in str between
+ // strIdxStart & strIdxEnd
+ int patLength = ( patIdxTmp - patIdxStart - 1 );
+ int strLength = ( strIdxEnd - strIdxStart + 1 );
+ int foundIdx = -1;
+ strLoop:
+ for ( int i = 0; i <= strLength - patLength; i++ )
+ {
+ for ( int j = 0; j < patLength; j++ )
+ {
+ String subPat = patDirs[patIdxStart + j + 1];
+ String subStr = strDirs[strIdxStart + i + j];
+ if ( !match( subPat, subStr, isCaseSensitive ) )
+ {
+ continue strLoop;
+ }
+ }
+
+ foundIdx = strIdxStart + i;
+ break;
+ }
+
+ if ( foundIdx == -1 )
+ {
+ return false;
+ }
+
+ patIdxStart = patIdxTmp;
+ strIdxStart = foundIdx + patLength;
+ }
+
+ for ( int i = patIdxStart; i <= patIdxEnd; i++ )
+ {
+ if ( !patDirs[i].equals( "**" ) )
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ static boolean matchAntPathPattern( char[][] patDirs, char[][] strDirs, boolean isCaseSensitive )
+ {
+ int patIdxStart = 0;
+ int patIdxEnd = patDirs.length - 1;
+ int strIdxStart = 0;
+ int strIdxEnd = strDirs.length - 1;
+
+ // up to first '**'
+ while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
+ {
+ char[] patDir = patDirs[patIdxStart];
+ if ( isDoubleStar( patDir ) )
+ {
+ break;
+ }
+ if ( !match( patDir, strDirs[strIdxStart], isCaseSensitive ) )
+ {
+ return false;
+ }
+ patIdxStart++;
+ strIdxStart++;
+ }
+ if ( strIdxStart > strIdxEnd )
+ {
+ // String is exhausted
+ for ( int i = patIdxStart; i <= patIdxEnd; i++ )
+ {
+ if ( !isDoubleStar( patDirs[i] ) )
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+ else
+ {
+ if ( patIdxStart > patIdxEnd )
+ {
+ // String not exhausted, but pattern is. Failure.
+ return false;
+ }
+ }
+
+ // up to last '**'
+ while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
+ {
+ char[] patDir = patDirs[patIdxEnd];
+ if ( isDoubleStar( patDir ) )
+ {
+ break;
+ }
+ if ( !match( patDir, strDirs[strIdxEnd], isCaseSensitive ) )
{
- patDirs = null;
- strDirs = null;
return false;
}
patIdxEnd--;
@@ -360,10 +514,8 @@ private static boolean matchAntPathPattern( String pattern, String str, boolean
// String is exhausted
for ( int i = patIdxStart; i <= patIdxEnd; i++ )
{
- if ( !patDirs.elementAt( i ).equals( "**" ) )
+ if ( !isDoubleStar( patDirs[i] ) )
{
- patDirs = null;
- strDirs = null;
return false;
}
}
@@ -375,7 +527,7 @@ private static boolean matchAntPathPattern( String pattern, String str, boolean
int patIdxTmp = -1;
for ( int i = patIdxStart + 1; i <= patIdxEnd; i++ )
{
- if ( patDirs.elementAt( i ).equals( "**" ) )
+ if ( isDoubleStar( patDirs[i] ) )
{
patIdxTmp = i;
break;
@@ -393,26 +545,24 @@ private static boolean matchAntPathPattern( String pattern, String str, boolean
int strLength = ( strIdxEnd - strIdxStart + 1 );
int foundIdx = -1;
strLoop:
- for ( int i = 0; i <= strLength - patLength; i++ )
- {
- for ( int j = 0; j < patLength; j++ )
- {
- String subPat = (String) patDirs.elementAt( patIdxStart + j + 1 );
- String subStr = (String) strDirs.elementAt( strIdxStart + i + j );
- if ( !match( subPat, subStr, isCaseSensitive ) )
- {
- continue strLoop;
- }
- }
-
- foundIdx = strIdxStart + i;
- break;
- }
+ for ( int i = 0; i <= strLength - patLength; i++ )
+ {
+ for ( int j = 0; j < patLength; j++ )
+ {
+ char[] subPat = patDirs[patIdxStart + j + 1];
+ char[] subStr = strDirs[strIdxStart + i + j];
+ if ( !match( subPat, subStr, isCaseSensitive ) )
+ {
+ continue strLoop;
+ }
+ }
+
+ foundIdx = strIdxStart + i;
+ break;
+ }
if ( foundIdx == -1 )
{
- patDirs = null;
- strDirs = null;
return false;
}
@@ -422,10 +572,8 @@ private static boolean matchAntPathPattern( String pattern, String str, boolean
for ( int i = patIdxStart; i <= patIdxEnd; i++ )
{
- if ( !patDirs.elementAt( i ).equals( "**" ) )
+ if ( !isDoubleStar( patDirs[i] ) )
{
- patDirs = null;
- strDirs = null;
return false;
}
}
@@ -433,6 +581,11 @@ private static boolean matchAntPathPattern( String pattern, String str, boolean
return true;
}
+ private static boolean isDoubleStar( char[] patDir )
+ {
+ return patDir != null && patDir.length == 2 && patDir[0] == '*' && patDir[1] == '*';
+ }
+
/**
* Tests whether or not a string matches against a pattern.
* The pattern may contain two special characters:null.
* @param str The string which must be matched against the pattern.
* Must not be null.
- *
* @return true if the string matches against the pattern,
* or false otherwise.
*/
@@ -458,22 +610,24 @@ public static boolean match( String pattern, String str )
* '*' means zero or more charactersnull.
- * @param str The string which must be matched against the pattern.
- * Must not be null.
+ * @param pattern The pattern to match against.
+ * Must not be null.
+ * @param str The string which must be matched against the pattern.
+ * Must not be null.
* @param isCaseSensitive Whether or not matching should be performed
* case sensitively.
- *
- *
* @return true if the string matches against the pattern,
* or false otherwise.
*/
- public static boolean match( String pattern, String str,
- boolean isCaseSensitive )
+ public static boolean match( String pattern, String str, boolean isCaseSensitive )
{
char[] patArr = pattern.toCharArray();
char[] strArr = str.toCharArray();
+ return match( patArr, strArr, isCaseSensitive);
+ }
+
+ public static boolean match( char[] patArr, char[] strArr, boolean isCaseSensitive )
+ {
int patIdxStart = 0;
int patIdxEnd = patArr.length - 1;
int strIdxStart = 0;
@@ -481,9 +635,9 @@ public static boolean match( String pattern, String str,
char ch;
boolean containsStar = false;
- for ( int i = 0; i < patArr.length; i++ )
+ for ( char aPatArr : patArr )
{
- if ( patArr[i] == '*' )
+ if ( aPatArr == '*' )
{
containsStar = true;
break;
@@ -634,8 +788,8 @@ private static boolean equals( char c1, char c2, boolean isCaseSensitive )
if ( !isCaseSensitive )
{
// NOTE: Try both upper case and lower case as done by String.equalsIgnoreCase()
- if ( Character.toUpperCase( c1 ) == Character.toUpperCase( c2 ) ||
- Character.toLowerCase( c1 ) == Character.toLowerCase( c2 ) )
+ if ( Character.toUpperCase( c1 ) == Character.toUpperCase( c2 )
+ || Character.toLowerCase( c1 ) == Character.toLowerCase( c2 ) )
{
return true;
}
@@ -643,28 +797,15 @@ private static boolean equals( char c1, char c2, boolean isCaseSensitive )
return false;
}
- /**
- * Breaks a path up into a Vector of path elements, tokenizing on
- * File.separator.
- *
- * @param path Path to tokenize. Must not be null.
- *
- * @return a Vector of path elements from the tokenized path
- */
- public static Vector tokenizePath( String path )
- {
- return tokenizePath( path, File.separator );
- }
-
- public static Vector tokenizePath( String path, String separator )
+ private static String[] tokenizePathToString( String path, String separator )
{
- Vector ret = new Vector();
+ ListCommon String manipulation routines.
null.
* @throws IOException If the environment variables could not be queried from the shell.
* @see System#getenv() System.getenv() API, new in JDK 5.0, to get the same result
- * since 2.0.2 System#getenv() will be used if available in the current running jvm.
+ * since 2.0.2 System#getenv() will be used if available in the current running jvm.
*/
public static Properties getSystemEnvVars()
throws IOException
@@ -277,137 +260,25 @@ public static Properties getSystemEnvVars()
*
* @param caseSensitive Whether environment variable keys should be treated case-sensitively.
* @return Properties object of (possibly modified) envar keys mapped to their values.
- * @throws IOException
+ * @throws IOException .
* @see System#getenv() System.getenv() API, new in JDK 5.0, to get the same result
- * since 2.0.2 System#getenv() will be used if available in the current running jvm.
+ * since 2.0.2 System#getenv() will be used if available in the current running jvm.
*/
public static Properties getSystemEnvVars( boolean caseSensitive )
throws IOException
{
-
- // check if it's 1.5+ run
-
- Method getenvMethod = getEnvMethod();
- if ( getenvMethod != null )
- {
- try
- {
- return getEnvFromSystem( getenvMethod, caseSensitive );
- }
- catch ( IllegalAccessException e )
- {
- throw new IOException( e.getMessage() );
- }
- catch ( IllegalArgumentException e )
- {
- throw new IOException( e.getMessage() );
- }
- catch ( InvocationTargetException e )
- {
- throw new IOException( e.getMessage() );
- }
- }
-
- Process p = null;
-
- try
- {
- Properties envVars = new Properties();
-
- Runtime r = Runtime.getRuntime();
-
- //If this is windows set the shell to command.com or cmd.exe with correct arguments.
- boolean overriddenEncoding = false;
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- if ( Os.isFamily( Os.FAMILY_WIN9X ) )
- {
- p = r.exec( "command.com /c set" );
- }
- else
- {
- overriddenEncoding = true;
- // /U = change stdout encoding to UTF-16LE to avoid encoding inconsistency
- // between command-line/DOS and GUI/Windows, see PLXUTILS-124
- p = r.exec( "cmd.exe /U /c set" );
- }
- }
- else
- {
- p = r.exec( "env" );
- }
-
- Reader reader = overriddenEncoding
- ? new InputStreamReader( p.getInputStream(), ReaderFactory.UTF_16LE )
- : new InputStreamReader( p.getInputStream() );
- BufferedReader br = new BufferedReader( reader );
-
- String line;
-
- String lastKey = null;
- String lastVal = null;
-
- while ( ( line = br.readLine() ) != null )
- {
- int idx = line.indexOf( '=' );
-
- if ( idx > 0 )
- {
- lastKey = line.substring( 0, idx );
-
- if ( !caseSensitive )
- {
- lastKey = lastKey.toUpperCase( Locale.ENGLISH );
- }
-
- lastVal = line.substring( idx + 1 );
-
- envVars.setProperty( lastKey, lastVal );
- }
- else if ( lastKey != null )
- {
- lastVal += "\n" + line;
-
- envVars.setProperty( lastKey, lastVal );
- }
- }
-
- return envVars;
- }
- finally
+ Properties envVars = new Properties();
+ MapUnify quotes in a path for the Bourne Shell.
* *
- * BourneShell.unifyQuotes(null) = null
- * BourneShell.unifyQuotes("") = (empty)
- * BourneShell.unifyQuotes("/test/quotedpath'abc") = /test/quotedpath\'abc
- * BourneShell.unifyQuotes("/test/quoted path'abc") = "/test/quoted path'abc"
- * BourneShell.unifyQuotes("/test/quotedpath\"abc") = "/test/quotedpath\"abc"
- * BourneShell.unifyQuotes("/test/quoted path\"abc") = "/test/quoted path\"abc"
- * BourneShell.unifyQuotes("/test/quotedpath\"'abc") = "/test/quotedpath\"'abc"
- * BourneShell.unifyQuotes("/test/quoted path\"'abc") = "/test/quoted path\"'abc"
+ * BourneShell.quoteOneItem(null) = null
+ * BourneShell.quoteOneItem("") = ''
+ * BourneShell.quoteOneItem("/test/quotedpath'abc") = '/test/quotedpath'"'"'abc'
+ * BourneShell.quoteOneItem("/test/quoted path'abc") = '/test/quoted pat'"'"'habc'
+ * BourneShell.quoteOneItem("/test/quotedpath\"abc") = '/test/quotedpath"abc'
+ * BourneShell.quoteOneItem("/test/quoted path\"abc") = '/test/quoted path"abc'
+ * BourneShell.quoteOneItem("/test/quotedpath\"'abc") = '/test/quotedpath"'"'"'abc'
+ * BourneShell.quoteOneItem("/test/quoted path\"'abc") = '/test/quoted path"'"'"'abc'
*
*
* @param path not null path.
* @return the path unified correctly for the Bourne shell.
*/
- protected static String unifyQuotes( String path )
+ protected String quoteOneItem( String path, boolean isExecutable )
{
if ( path == null )
{
return null;
}
- if ( path.indexOf( " " ) == -1 && path.indexOf( "'" ) != -1 && path.indexOf( "\"" ) == -1 )
- {
- return StringUtils.escape( path );
- }
+ StringBuilder sb = new StringBuilder();
+ sb.append( "'" );
+ sb.append( path.replace( "'", "'\"'\"'" ) );
+ sb.append( "'" );
- return StringUtils.quoteAndEscape( path, '\"', BASH_QUOTING_TRIGGER_CHARS );
+ return sb.toString();
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
index 28a2149f..a96bb68a 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
@@ -77,9 +77,9 @@ public CmdShell()
* appears to make Windows processes invoke successfully.
*
*/
- public List getCommandLine( String executable, String[] arguments )
+ public ListUsing simple dotted expressions to extract the values from an Object instance,
- * For example we might want to extract a value like: project.build.sourceDirectory
The implementation supports indexed, nested and mapped properties similar to the JSP way.
- * + *
+ * Using simple dotted expressions to extract the values from an Object instance, For example we might want to extract a
+ * value like: project.build.sourceDirectory
+ *
+ * The implementation supports indexed, nested and mapped properties similar to the JSP way. + *
+ * * @author Jason van Zyl * @author Vincent Siveton * @version $Id$ - * @see http://struts.apache.org/1.x/struts-taglib/indexedprops.html + * @see http://struts.apache.org/1.x/struts-taglib/indexedprops.html */ public class ReflectionValueExtractor { - private static final Class[] CLASS_ARGS = new Class[0]; + private static final Class[] CLASS_ARGS = new Class[0]; private static final Object[] OBJECT_ARGS = new Object[0]; /** - * Use a WeakHashMap here, so the keys (Class objects) can be garbage collected. - * This approach prevents permgen space overflows due to retention of discarded - * classloaders. + * Use a WeakHashMap here, so the keys (Class objects) can be garbage collected. This approach prevents permgen + * space overflows due to retention of discarded classloaders. */ - private static final Map classMaps = new WeakHashMap(); + private static final Map(\\w+)\\[(\\d+)\\]
- */
- private static final Pattern INDEXED_PROPS = Pattern.compile( "(\\w+)\\[(\\d+)\\]" );
+ static final int EOF = -1;
- /**
- * Indexed properties pattern, ie (\\w+)\\((.+)\\)
- */
- private static final Pattern MAPPED_PROPS = Pattern.compile( "(\\w+)\\((.+)\\)" );
+ static final char PROPERTY_START = '.';
+
+ static final char INDEXED_START = '[';
+
+ static final char INDEXED_END = ']';
+
+ static final char MAPPED_START = '(';
+
+ static final char MAPPED_END = ')';
+
+ static class Tokenizer
+ {
+ final String expression;
+
+ int idx;
+
+ public Tokenizer( String expression )
+ {
+ this.expression = expression;
+ }
+
+ public int peekChar()
+ {
+ return idx < expression.length() ? expression.charAt( idx ) : EOF;
+ }
+
+ public int skipChar()
+ {
+ return idx < expression.length() ? expression.charAt( idx++ ) : EOF;
+ }
+
+ public String nextToken( char delimiter )
+ {
+ int start = idx;
+
+ while ( idx < expression.length() && delimiter != expression.charAt( idx ) )
+ {
+ idx++;
+ }
+
+ // delimiter MUST be present
+ if ( idx <= start || idx >= expression.length() )
+ {
+ return null;
+ }
+
+ return expression.substring( start, idx++ );
+ }
+
+ public String nextPropertyName()
+ {
+ final int start = idx;
+
+ while ( idx < expression.length() && Character.isJavaIdentifierPart( expression.charAt( idx ) ) )
+ {
+ idx++;
+ }
+
+ // property name does not require delimiter
+ if ( idx <= start || idx > expression.length() )
+ {
+ return null;
+ }
+
+ return expression.substring( start, idx );
+ }
+
+ public int getPosition()
+ {
+ return idx < expression.length() ? idx : EOF;
+ }
+
+ // to make tokenizer look pretty in debugger
+ @Override
+ public String toString()
+ {
+ return idx < expression.length() ? expression.substring( idx ) : "The implementation supports indexed, nested and mapped properties.
- * + *+ * The implementation supports indexed, nested and mapped properties. + *
*(\\w+)\\[(\\d+)\\]
* pattern, i.e. "user.addresses[1].street"(\\w+)\\((.+)\\) pattern, i.e. "user.addresses(myAddress).street"(\\w+)\\((.+)\\) pattern, i.e.
+ * "user.addresses(myAddress).street"The implementation supports indexed, nested and mapped properties.
- * + *+ * The implementation supports indexed, nested and mapped properties. + *
*(\\w+)\\[(\\d+)\\]
* pattern, i.e. "user.addresses[1].street"(\\w+)\\((.+)\\) pattern, i.e. "user.addresses(myAddress).street"(\\w+)\\((.+)\\) pattern, i.e.
+ * "user.addresses(myAddress).street"