You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2008/09/07 00:13:32 UTC
svn commit: r692749 - in /maven/shared/trunk/maven-filtering/src:
main/java/org/apache/maven/shared/filtering/
test/java/org/apache/maven/shared/filtering/
Author: olamy
Date: Sat Sep 6 15:13:31 2008
New Revision: 692749
URL: http://svn.apache.org/viewvc?rev=692749&view=rev
Log:
[MSHARED-59] More debug output in maven filtering
Display :
- copying/filtering from to
- all properties collected
- if a file extension can be filtered or not
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=692749&r1=692748&r2=692749&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java (original)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java Sat Sep 6 15:13:31 2008
@@ -34,6 +34,7 @@
import org.codehaus.plexus.interpolation.InterpolatorFilterReader;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.interpolation.ValueSource;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -45,6 +46,7 @@
* role-hint="default"
*/
public class DefaultMavenFileFilter
+ extends AbstractLogEnabled
implements MavenFileFilter
{
@@ -60,17 +62,25 @@
public void copyFile( File from, File to, boolean filtering, List filterWrappers, String encoding )
throws MavenFilteringException
{
-
+
try
{
if ( filtering )
{
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "filering " + from.getPath() + " to " + to.getPath() );
+ }
FileUtils.FilterWrapper[] wrappers = (FileUtils.FilterWrapper[]) filterWrappers
.toArray( new FileUtils.FilterWrapper[filterWrappers.size()] );
FileUtils.copyFile( from, to, encoding, wrappers );
}
else
{
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "copy " + from.getPath() + " to " + to.getPath() );
+ }
FileUtils.copyFile( from, to, encoding, new FileUtils.FilterWrapper[0] );
}
}
@@ -124,6 +134,11 @@
List defaultFilterWrappers = new ArrayList( 3 );
+ if (getLogger().isDebugEnabled())
+ {
+ getLogger().debug( "properties used " + filterProperties );
+ }
+
final ValueSource propertiesValueSource =
new PropertiesEscapingBackSlashValueSource( escapedBackslashesInFilePath, filterProperties );
Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=692749&r1=692748&r2=692749&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java (original)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java Sat Sep 6 15:13:31 2008
@@ -109,7 +109,15 @@
{
nonFilteredFileExtensions.addAll( userNonFilteredFileExtensions );
}
- return !nonFilteredFileExtensions.contains( StringUtils.lowerCase( FileUtils.extension( fileName ) ) );
+ boolean filteredFileExtension = !nonFilteredFileExtensions.contains( StringUtils.lowerCase( FileUtils
+ .extension( fileName ) ) );
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug(
+ "file " + fileName + " has a" + ( filteredFileExtension ? " " : " non " )
+ + "filtered file extension" );
+ }
+ return filteredFileExtension;
}
public List getDefaultNonFilteredFileExtensions()
Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java?rev=692749&r1=692748&r2=692749&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java Sat Sep 6 15:13:31 2008
@@ -29,6 +29,7 @@
import org.apache.maven.model.Resource;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -54,6 +55,8 @@
FileUtils.forceDelete( outputDirectory );
}
outputDirectory.mkdirs();
+ LoggerManager loggerManager = (LoggerManager) lookup( LoggerManager.ROLE );
+ loggerManager.setThreshold( 0 );
}
public void testSimpleFiltering()