You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/02/15 17:20:57 UTC
svn commit: r378027 - in /maven/shared/trunk/file-management: pom.xml
src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Author: jdcasey
Date: Wed Feb 15 08:20:54 2006
New Revision: 378027
URL: http://svn.apache.org/viewcvs?rev=378027&view=rev
Log:
Removing dependency on maven-shared-monitor, to keep things simple until we find a good overall logging strategy.
Modified:
maven/shared/trunk/file-management/pom.xml
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Modified: maven/shared/trunk/file-management/pom.xml
URL: http://svn.apache.org/viewcvs/maven/shared/trunk/file-management/pom.xml?rev=378027&r1=378026&r2=378027&view=diff
==============================================================================
--- maven/shared/trunk/file-management/pom.xml (original)
+++ maven/shared/trunk/file-management/pom.xml Wed Feb 15 08:20:54 2006
@@ -25,9 +25,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-monitor</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
URL: http://svn.apache.org/viewcvs/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java?rev=378027&r1=378026&r2=378027&view=diff
==============================================================================
--- maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java (original)
+++ maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java Wed Feb 15 08:20:54 2006
@@ -10,8 +10,8 @@
import java.util.List;
import java.util.Set;
+import org.apache.maven.plugin.logging.Log;
import org.apache.maven.shared.model.fileset.FileSet;
-import org.apache.maven.shared.monitor.Monitor;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
@@ -21,15 +21,27 @@
private static final int DELETE_RETRY_SLEEP_MILLIS = 10;
private static final String[] EMPTY_STRING_ARRAY = new String[0];
- private final Monitor monitor;
private final boolean verbose;
+ private final Log log;
- public FileSetManager( Monitor monitor, boolean verbose )
+ public FileSetManager( Log log, boolean verbose )
{
- this.monitor = monitor;
+ this.log = log;
this.verbose = verbose;
}
+ public FileSetManager( Log log )
+ {
+ this.log = log;
+ this.verbose = false;
+ }
+
+ public FileSetManager()
+ {
+ this.log = null;
+ this.verbose = false;
+ }
+
public String[] getIncludedFiles( FileSet fileSet )
{
DirectoryScanner scanner = scan( fileSet );
@@ -102,7 +114,7 @@
{
if ( verbose )
{
- monitor.info( "Deleting directory: " + file );
+ log.info( "Deleting directory: " + file );
}
FileUtils.deleteDirectory( file );
@@ -111,7 +123,7 @@
{
if ( verbose )
{
- monitor.info( "Deleting file: " + file );
+ log.info( "Deleting file: " + file );
}
if ( !delete( file ) )
Modified: maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
URL: http://svn.apache.org/viewcvs/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java?rev=378027&r1=378026&r2=378027&view=diff
==============================================================================
--- maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java (original)
+++ maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java Wed Feb 15 08:20:54 2006
@@ -13,8 +13,6 @@
import junit.framework.TestCase;
import org.apache.maven.shared.model.fileset.FileSet;
-import org.apache.maven.shared.monitor.BasicMonitor;
-import org.apache.maven.shared.monitor.Monitor;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.Commandline;
@@ -52,8 +50,7 @@
set.setDirectory( directory.getPath() );
set.addInclude( "**/included.txt" );
- Monitor monitor = new BasicMonitor( System.out );
- FileSetManager fileSetManager = new FileSetManager( monitor, true );
+ FileSetManager fileSetManager = new FileSetManager();
String[] included = fileSetManager.getIncludedFiles( set );
@@ -77,8 +74,7 @@
set.addInclude( "**/included.txt" );
set.setFollowSymlinks( false );
- Monitor monitor = new BasicMonitor( System.out );
- FileSetManager fileSetManager = new FileSetManager( monitor, true );
+ FileSetManager fileSetManager = new FileSetManager();
String[] included = fileSetManager.getIncludedFiles( set );
@@ -104,8 +100,7 @@
set.addInclude( "**/linked-to-self" );
set.setFollowSymlinks( false );
- Monitor monitor = new BasicMonitor( System.out );
- FileSetManager fileSetManager = new FileSetManager( monitor, true );
+ FileSetManager fileSetManager = new FileSetManager();
fileSetManager.delete( set );
@@ -123,8 +118,7 @@
set.addInclude( "**/included.txt" );
set.addInclude( "**/subdir" );
- Monitor monitor = new BasicMonitor( System.out );
- FileSetManager fileSetManager = new FileSetManager( monitor, true );
+ FileSetManager fileSetManager = new FileSetManager();
fileSetManager.delete( set );