You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/06/16 00:53:53 UTC
svn commit: r1136234 - in /maven/sandbox/trunk/plexus-utils-commons-bridge:
plexus-utils-commons-bridge/pom.xml
plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
pom.xml
Author: stephenc
Date: Wed Jun 15 22:53:53 2011
New Revision: 1136234
URL: http://svn.apache.org/viewvc?rev=1136234&view=rev
Log:
made some progress on fileUtils
Modified:
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/pom.xml
maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
maven/sandbox/trunk/plexus-utils-commons-bridge/pom.xml
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/pom.xml?rev=1136234&r1=1136233&r2=1136234&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/pom.xml (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/pom.xml Wed Jun 15 22:53:53 2011
@@ -25,6 +25,10 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java?rev=1136234&r1=1136233&r2=1136234&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/FileUtils.java Wed Jun 15 22:53:53 2011
@@ -19,11 +19,15 @@ package org.codehaus.plexus.util;
* under the License.
*/
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang.text.StrBuilder;
import org.codehaus.plexus.util.io.InputStreamFacade;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
+import java.net.FileNameMap;
+import java.util.Arrays;
import java.util.List;
/**
@@ -47,20 +51,66 @@ public class FileUtils
{
throw new UnsupportedOperationException( "TODO: Implement" );
}
+ private static final String[] DEFAULT_EXCLUDES = {
+ // Miscellaneous typical temporary files
+ "**/*~", "**/#*#", "**/.#*", "**/%*%", "**/._*",
+
+ // CVS
+ "**/CVS", "**/CVS/**", "**/.cvsignore",
+
+ // RCS
+ "**/RCS", "**/RCS/**",
+
+ // SCCS
+ "**/SCCS", "**/SCCS/**",
+
+ // Visual SourceSafe
+ "**/vssver.scc",
+
+ // Subversion
+ "**/.svn", "**/.svn/**",
+
+ // Arch
+ "**/.arch-ids", "**/.arch-ids/**",
+
+ //Bazaar
+ "**/.bzr", "**/.bzr/**",
+
+ //SurroundSCM
+ "**/.MySCMServerInfo",
+
+ // Mac
+ "**/.DS_Store",
+
+ // Serena Dimensions Version 10
+ "**/.metadata", "**/.metadata/**",
+
+ // Mercurial
+ "**/.hg", "**/.hg/**",
+
+ // git
+ "**/.git", "**/.git/**",
+
+ // BitKeeper
+ "**/BitKeeper", "**/BitKeeper/**", "**/ChangeSet", "**/ChangeSet/**",
+
+ // darcs
+ "**/_darcs", "**/_darcs/**", "**/.darcsrepo", "**/.darcsrepo/**", "**/-darcs-backup*", "**/.darcs-temp-mail" };
+
public static String[] getDefaultExcludes()
{
- throw new UnsupportedOperationException( "TODO: Implement" );
+ return DEFAULT_EXCLUDES.clone();
}
public static List getDefaultExcludesAsList()
{
- throw new UnsupportedOperationException( "TODO: Implement" );
+ return Arrays.asList(getDefaultExcludes());
}
public static String getDefaultExcludesAsString()
{
- throw new UnsupportedOperationException( "TODO: Implement" );
+ return new StrBuilder().appendWithSeparators(getDefaultExcludes(), ",").toString();
}
public static String byteCountToDisplaySize( int byteCount )
@@ -70,7 +120,8 @@ public class FileUtils
public static String dirname( String name )
{
- throw new UnsupportedOperationException( "TODO: Implement" );
+ name.getClass();
+ return FilenameUtils.getPathNoEndSeparator(name);
}
public static String filename( String name )
Modified: maven/sandbox/trunk/plexus-utils-commons-bridge/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plexus-utils-commons-bridge/pom.xml?rev=1136234&r1=1136233&r2=1136234&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/pom.xml (original)
+++ maven/sandbox/trunk/plexus-utils-commons-bridge/pom.xml Wed Jun 15 22:53:53 2011
@@ -46,14 +46,19 @@ under the License.
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>