Author: olamy
Date: Thu Jul 5 09:16:43 2012
New Revision: 1357509
URL: http://svn.apache.org/viewvc?rev=1357509&view=rev
Log:
use generics
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
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/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java?rev=1357509&r1=1357508&r2=1357509&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
Thu Jul 5 09:16:43 2012
@@ -36,7 +36,7 @@ public class AbstractMavenFilteringReque
private MavenProject mavenProject;
- private List filters;
+ private List<String> filters;
private boolean escapeWindowsPaths = true;
@@ -92,7 +92,7 @@ public class AbstractMavenFilteringReque
initDefaults();
}
- protected AbstractMavenFilteringRequest( MavenProject mavenProject, List
filters,
+ protected AbstractMavenFilteringRequest( MavenProject mavenProject,
List<String> filters,
String encoding, MavenSession
mavenSession )
{
initDefaults();
@@ -121,22 +121,22 @@ public class AbstractMavenFilteringReque
this.mavenProject = mavenProject;
}
- public List getFilters()
+ public List<String> getFilters()
{
return filters;
}
- public void setFilters( List filters )
+ public void setFilters( List<String> filters )
{
this.filters = filters;
}
- public List getFileFilters()
+ public List<String> getFileFilters()
{
return getFilters();
}
- public void setFileFilters( List filters )
+ public void setFileFilters( List<String> filters )
{
setFilters( filters );
}
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=1357509&r1=1357508&r2=1357509&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
Thu Jul 5 09:16:43 2012
@@ -62,7 +62,7 @@ public class DefaultMavenFileFilter
*/
private BuildContext buildContext;
- public void copyFile( File from, File to, boolean filtering, MavenProject
mavenProject, List filters,
+ public void copyFile( File from, File to, boolean filtering, MavenProject
mavenProject, List<String> filters,
boolean escapedBackslashesInFilePath, String
encoding, MavenSession mavenSession )
throws MavenFilteringException
{
@@ -73,7 +73,7 @@ public class DefaultMavenFileFilter
mre.setMavenSession( mavenSession );
mre.setInjectProjectBuildFilters( true );
- List filterWrappers = getDefaultFilterWrappers( mre );
+ List<FileUtils.FilterWrapper> filterWrappers =
getDefaultFilterWrappers( mre );
copyFile( from, to, filtering, filterWrappers, encoding );
}
@@ -88,7 +88,8 @@ public class DefaultMavenFileFilter
}
- public void copyFile( File from, File to, boolean filtering, List
filterWrappers, String encoding )
+ public void copyFile( File from, File to, boolean filtering,
List<FileUtils.FilterWrapper> filterWrappers,
+ String encoding )
throws MavenFilteringException
{
// overwrite forced to false to preserve backward comp
@@ -96,8 +97,8 @@ public class DefaultMavenFileFilter
}
- public void copyFile( File from, File to, boolean filtering, List
filterWrappers, String encoding,
- boolean overwrite )
+ public void copyFile( File from, File to, boolean filtering,
List<FileUtils.FilterWrapper> filterWrappers,
+ String encoding, boolean overwrite )
throws MavenFilteringException
{
try
@@ -134,7 +135,8 @@ public class DefaultMavenFileFilter
* @see
org.apache.maven.shared.filtering.MavenFileFilter#getDefaultFilterWrappers(org.apache.maven.project.MavenProject,
java.util.List, boolean, org.apache.maven.execution.MavenSession)
* @deprecated
*/
- public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final
MavenProject mavenProject, List filters,
+ public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final
MavenProject mavenProject,
+
List<String> filters,
final
boolean escapedBackslashesInFilePath,
MavenSession mavenSession )
throws MavenFilteringException
@@ -143,7 +145,7 @@ public class DefaultMavenFileFilter
}
- public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final
MavenProject mavenProject, List filters,
+ public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final
MavenProject mavenProject, List<String> filters,
final
boolean escapedBackslashesInFilePath,
MavenSession mavenSession,
MavenResourcesExecution mavenResourcesExecution )
@@ -210,7 +212,7 @@ public class DefaultMavenFileFilter
{
if ( request.isInjectProjectBuildFilters() )
{
- List buildFilters = new ArrayList(
request.getMavenProject().getBuild().getFilters() );
+ List<String> buildFilters = new ArrayList(
request.getMavenProject().getBuild().getFilters() );
buildFilters.removeAll( request.getFileFilters() );
loadProperties( filterProperties, buildFilters, baseProps );
@@ -260,8 +262,7 @@ public class DefaultMavenFileFilter
/**
* protected only for testing reason !
*/
- protected void loadProperties( Properties filterProperties, List /* String
*/propertiesFilePaths,
- Properties baseProps )
+ protected void loadProperties( Properties filterProperties, List<String>
propertiesFilePaths, Properties baseProps )
throws MavenFilteringException
{
if ( propertiesFilePaths != null )
@@ -302,7 +303,7 @@ public class DefaultMavenFileFilter
private ValueSource propertiesValueSource;
- private List projectStartExpressions;
+ private List<String> projectStartExpressions;
private String escapeString;
@@ -313,7 +314,7 @@ public class DefaultMavenFileFilter
private boolean supportMultiLineFiltering;
Wrapper( LinkedHashSet<String> delimiters, MavenProject project,
MavenSession mavenSession,
- ValueSource propertiesValueSource, List
projectStartExpressions, String escapeString,
+ ValueSource propertiesValueSource, List<String>
projectStartExpressions, String escapeString,
boolean escapeWindowsPaths, boolean supportMultiLineFiltering
)
{
super();
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=1357509&r1=1357508&r2=1357509&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
Thu Jul 5 09:16:43 2012
@@ -19,13 +19,6 @@ package org.apache.maven.shared.filterin
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
@@ -39,25 +32,32 @@ import org.codehaus.plexus.util.Scanner;
import org.codehaus.plexus.util.StringUtils;
import org.sonatype.plexus.build.incremental.BuildContext;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
/**
* @author Olivier Lamy
* @version $Id$
- *
* @plexus.component
role="org.apache.maven.shared.filtering.MavenResourcesFiltering"
- * role-hint="default"
+ * role-hint="default"
*/
public class DefaultMavenResourcesFiltering
extends AbstractLogEnabled
implements MavenResourcesFiltering, Initializable
{
- private static final String[] EMPTY_STRING_ARRAY = {};
+ private static final String[] EMPTY_STRING_ARRAY = { };
+
+ private static final String[] DEFAULT_INCLUDES = { "**/**" };
- private static final String[] DEFAULT_INCLUDES = {"**/**"};
-
- private List defaultNonFilteredFileExtensions;
+ private List<String> defaultNonFilteredFileExtensions;
- /** @plexus.requirement */
+ /**
+ * @plexus.requirement
+ */
private BuildContext buildContext;
// ------------------------------------------------
@@ -67,63 +67,59 @@ public class DefaultMavenResourcesFilter
throws InitializationException
{
// jpg,jpeg,gif,bmp,png
- this.defaultNonFilteredFileExtensions = new ArrayList( 5 );
+ this.defaultNonFilteredFileExtensions = new ArrayList<String>( 5 );
this.defaultNonFilteredFileExtensions.add( "jpg" );
this.defaultNonFilteredFileExtensions.add( "jpeg" );
this.defaultNonFilteredFileExtensions.add( "gif" );
this.defaultNonFilteredFileExtensions.add( "bmp" );
this.defaultNonFilteredFileExtensions.add( "png" );
- }
-
-
-
+ }
+
+
/**
- * @plexus.requirement
- * role-hint="default"
+ * @plexus.requirement role-hint="default"
*/
private MavenFileFilter mavenFileFilter;
-
- public void filterResources( List resources, File outputDirectory,
MavenProject mavenProject, String encoding,
- List fileFilters, List
nonFilteredFileExtensions, MavenSession mavenSession )
+
+ public void filterResources( List<Resource> resources, File
outputDirectory, MavenProject mavenProject,
+ String encoding, List<String> fileFilters,
List<String> nonFilteredFileExtensions,
+ MavenSession mavenSession )
throws MavenFilteringException
{
- MavenResourcesExecution mavenResourcesExecution = new
MavenResourcesExecution( resources, outputDirectory,
-
mavenProject, encoding,
-
fileFilters,
-
nonFilteredFileExtensions,
-
mavenSession );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory,
mavenProject, encoding, fileFilters,
+ nonFilteredFileExtensions,
mavenSession );
mavenResourcesExecution.setUseDefaultFilterWrappers( true );
// mavenResourcesExecution.setEscapeWindowsPaths( false );
-
+
filterResources( mavenResourcesExecution );
}
- public void filterResources( List resources, File outputDirectory, String
encoding, List filterWrappers,
- File resourcesBaseDirectory, List
nonFilteredFileExtensions )
+ public void filterResources( List<Resource> resources, File
outputDirectory, String encoding,
+ List<FileUtils.FilterWrapper> filterWrappers,
File resourcesBaseDirectory,
+ List<String> nonFilteredFileExtensions )
throws MavenFilteringException
{
- MavenResourcesExecution mavenResourcesExecution = new
MavenResourcesExecution( resources, outputDirectory,
-
encoding, filterWrappers,
-
resourcesBaseDirectory,
-
nonFilteredFileExtensions );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, encoding,
filterWrappers, resourcesBaseDirectory,
+ nonFilteredFileExtensions );
filterResources( mavenResourcesExecution );
}
-
- public boolean filteredFileExtension( String fileName, List
userNonFilteredFileExtensions )
+
+ public boolean filteredFileExtension( String fileName, List<String>
userNonFilteredFileExtensions )
{
- List nonFilteredFileExtensions = new ArrayList(
getDefaultNonFilteredFileExtensions() );
+ List<String> nonFilteredFileExtensions = new ArrayList<String>(
getDefaultNonFilteredFileExtensions() );
if ( userNonFilteredFileExtensions != null )
{
nonFilteredFileExtensions.addAll( userNonFilteredFileExtensions );
}
- boolean filteredFileExtension = !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" );
+ "file " + fileName + " has a" + ( filteredFileExtension ? " "
: " non " ) + "filtered file extension" );
}
return filteredFileExtension;
}
@@ -140,21 +136,21 @@ public class DefaultMavenResourcesFilter
{
throw new MavenFilteringException( "mavenResourcesExecution cannot
be null" );
}
-
+
if ( mavenResourcesExecution.getResources() == null )
{
getLogger().info( "No resources configured skip copying/filtering"
);
return;
}
-
+
if ( mavenResourcesExecution.getOutputDirectory() == null )
{
throw new MavenFilteringException( "outputDirectory cannot be
null" );
}
-
+
if ( mavenResourcesExecution.isUseDefaultFilterWrappers() )
{
- List filterWrappers = new ArrayList();
+ List<FileUtils.FilterWrapper> filterWrappers = new
ArrayList<FileUtils.FilterWrapper>();
if ( mavenResourcesExecution.getFilterWrappers() != null )
{
filterWrappers.addAll(
mavenResourcesExecution.getFilterWrappers() );
@@ -165,33 +161,29 @@ public class DefaultMavenResourcesFilter
if ( mavenResourcesExecution.getEncoding() == null ||
mavenResourcesExecution.getEncoding().length() < 1 )
{
- getLogger().warn(
- "Using platform encoding (" +
ReaderFactory.FILE_ENCODING
+ getLogger().warn( "Using platform encoding (" +
ReaderFactory.FILE_ENCODING
+ " actually) to copy filtered resources,
i.e. build is platform dependent!" );
}
else
{
getLogger().info(
- "Using '" + mavenResourcesExecution.getEncoding()
- + "' encoding to copy filtered resources." );
+ "Using '" + mavenResourcesExecution.getEncoding() + "'
encoding to copy filtered resources." );
}
-
- for ( Iterator i = mavenResourcesExecution.getResources().iterator();
i.hasNext(); )
+
+ for ( Resource resource : mavenResourcesExecution.getResources() )
{
- Resource resource = (Resource) i.next();
-
+
if ( getLogger().isDebugEnabled() )
{
String ls = System.getProperty( "line.separator" );
- StringBuffer debugMessage = new StringBuffer( "resource with
targetPath " + resource.getTargetPath() )
- .append( ls );
+ StringBuffer debugMessage =
+ new StringBuffer( "resource with targetPath " +
resource.getTargetPath() ).append( ls );
debugMessage.append( "directory " + resource.getDirectory()
).append( ls );
+ debugMessage.append( "excludes " + ( resource.getExcludes() ==
null
+ ? " empty "
+ : resource.getExcludes().toString() ) ).append( ls );
debugMessage.append(
- "excludes "
- + ( resource.getExcludes() == null ?
" empty " : resource.getExcludes()
- .toString() ) ).append( ls );
- debugMessage.append( "includes "
- + ( resource.getIncludes() == null ? " empty " :
resource.getIncludes().toString() ) );
+ "includes " + ( resource.getIncludes() == null ? " empty "
: resource.getIncludes().toString() ) );
getLogger().debug( debugMessage.toString() );
}
@@ -201,8 +193,8 @@ public class DefaultMavenResourcesFilter
if ( !resourceDirectory.isAbsolute() )
{
- resourceDirectory = new File(
mavenResourcesExecution.getResourcesBaseDirectory(), resourceDirectory
- .getPath() );
+ resourceDirectory =
+ new File(
mavenResourcesExecution.getResourcesBaseDirectory(),
resourceDirectory.getPath() );
}
if ( !resourceDirectory.exists() )
@@ -219,10 +211,9 @@ public class DefaultMavenResourcesFilter
{
throw new MavenFilteringException( "Cannot create resource
output directory: " + outputDirectory );
}
-
- boolean ignoreDelta =
- !outputExists || buildContext.hasDelta(
mavenResourcesExecution.getFileFilters() )
- || buildContext.hasDelta( getRelativeOutputDirectory(
mavenResourcesExecution ) );
+
+ boolean ignoreDelta = !outputExists || buildContext.hasDelta(
mavenResourcesExecution.getFileFilters() )
+ || buildContext.hasDelta( getRelativeOutputDirectory(
mavenResourcesExecution ) );
getLogger().debug( "ignoreDelta " + ignoreDelta );
Scanner scanner = buildContext.newScanner( resourceDirectory,
ignoreDelta );
@@ -234,59 +225,58 @@ public class DefaultMavenResourcesFilter
{
try
{
- File targetDirectory = targetPath == null ? outputDirectory
- : new File(
outputDirectory, targetPath );
+ File targetDirectory =
+ targetPath == null ? outputDirectory : new File(
outputDirectory, targetPath );
copyDirectoryLayout( resourceDirectory, targetDirectory,
scanner );
}
catch ( IOException e )
{
- throw new MavenFilteringException( "Cannot copy directory
structure from "
- + resourceDirectory.getPath() + " to " +
outputDirectory.getPath() );
+ throw new MavenFilteringException(
+ "Cannot copy directory structure from " +
resourceDirectory.getPath() + " to "
+ + outputDirectory.getPath() );
}
}
- List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+ List<String> includedFiles = Arrays.asList(
scanner.getIncludedFiles() );
getLogger().info(
- "Copying " + includedFiles.size() + " resource"
+ ( includedFiles.size() > 1 ? "s" : "" )
- + ( targetPath == null ? "" : " to " +
targetPath ) );
+ "Copying " + includedFiles.size() + " resource" + (
includedFiles.size() > 1 ? "s" : "" ) + (
+ targetPath == null ? "" : " to " + targetPath ) );
- for ( Iterator j = includedFiles.iterator(); j.hasNext(); )
+ for ( String name : includedFiles )
{
- String name = (String) j.next();
File source = new File( resourceDirectory, name );
//File destinationFile = new File( outputDirectory,
destination );
File destinationFile = getDestinationFile( outputDirectory,
targetPath, name );
-
- boolean filteredExt = filteredFileExtension( source.getName(),
mavenResourcesExecution
- .getNonFilteredFileExtensions() );
-
+
+ boolean filteredExt =
+ filteredFileExtension( source.getName(),
mavenResourcesExecution.getNonFilteredFileExtensions() );
+
mavenFileFilter.copyFile( source, destinationFile,
resource.isFiltering() && filteredExt,
-
mavenResourcesExecution.getFilterWrappers(), mavenResourcesExecution
- .getEncoding(),
mavenResourcesExecution.isOverwrite() );
+
mavenResourcesExecution.getFilterWrappers(),
+
mavenResourcesExecution.getEncoding(),
+
mavenResourcesExecution.isOverwrite() );
}
// deal with deleted source files
scanner = buildContext.newDeleteScanner( resourceDirectory );
-
+
setupScanner( resource, scanner );
-
+
scanner.scan();
- List deletedFiles = Arrays.asList( scanner.getIncludedFiles() );
+ List<String> deletedFiles = Arrays.asList(
scanner.getIncludedFiles() );
- for ( Iterator j = deletedFiles.iterator(); j.hasNext(); )
+ for ( String name : deletedFiles )
{
- String name = (String) j.next();
-
File destinationFile = getDestinationFile( outputDirectory,
targetPath, name );
-
+
destinationFile.delete();
-
+
buildContext.refresh( destinationFile );
}
@@ -296,50 +286,50 @@ public class DefaultMavenResourcesFilter
private File getDestinationFile( File outputDirectory, String targetPath,
String name )
{
- String destination = name;
+ String destination = name;
- if ( targetPath != null )
- {
- destination = targetPath + "/" + name;
- }
-
- File destinationFile = new File( destination );
- if ( !destinationFile.isAbsolute() )
- {
- destinationFile = new File( outputDirectory, destination );
- }
-
- if ( !destinationFile.getParentFile().exists() )
- {
- destinationFile.getParentFile().mkdirs();
- }
- return destinationFile;
+ if ( targetPath != null )
+ {
+ destination = targetPath + "/" + name;
+ }
+
+ File destinationFile = new File( destination );
+ if ( !destinationFile.isAbsolute() )
+ {
+ destinationFile = new File( outputDirectory, destination );
+ }
+
+ if ( !destinationFile.getParentFile().exists() )
+ {
+ destinationFile.getParentFile().mkdirs();
+ }
+ return destinationFile;
}
private String[] setupScanner( Resource resource, Scanner scanner )
{
- String[] includes = null;
- if ( resource.getIncludes() != null && !resource.getIncludes().isEmpty()
)
- {
- includes = (String[]) resource.getIncludes().toArray(
EMPTY_STRING_ARRAY ) ;
- }
- else
- {
- includes = DEFAULT_INCLUDES;
- }
- scanner.setIncludes( includes );
-
- String[] excludes = null;
- if ( resource.getExcludes() != null && !resource.getExcludes().isEmpty()
)
- {
- excludes = (String[]) resource.getExcludes().toArray(
EMPTY_STRING_ARRAY );
- scanner.setExcludes( excludes );
- }
+ String[] includes = null;
+ if ( resource.getIncludes() != null &&
!resource.getIncludes().isEmpty() )
+ {
+ includes = (String[]) resource.getIncludes().toArray(
EMPTY_STRING_ARRAY );
+ }
+ else
+ {
+ includes = DEFAULT_INCLUDES;
+ }
+ scanner.setIncludes( includes );
+
+ String[] excludes = null;
+ if ( resource.getExcludes() != null &&
!resource.getExcludes().isEmpty() )
+ {
+ excludes = (String[]) resource.getExcludes().toArray(
EMPTY_STRING_ARRAY );
+ scanner.setExcludes( excludes );
+ }
- scanner.addDefaultExcludes();
- return includes;
+ scanner.addDefaultExcludes();
+ return includes;
}
-
+
private void copyDirectoryLayout( File sourceDirectory, File
destinationDirectory, Scanner scanner )
throws IOException
{
@@ -363,12 +353,10 @@ public class DefaultMavenResourcesFilter
throw new IOException( "Source directory doesn't exists (" +
sourceDirectory.getAbsolutePath() + ")." );
}
- List includedDirectories = Arrays.asList(
scanner.getIncludedDirectories() );
+ List<String> includedDirectories = Arrays.asList(
scanner.getIncludedDirectories() );
- for ( Iterator i = includedDirectories.iterator(); i.hasNext(); )
+ for ( String name : includedDirectories )
{
- String name = (String) i.next();
-
File source = new File( sourceDirectory, name );
if ( source.equals( sourceDirectory ) )
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java?rev=1357509&r1=1357508&r2=1357509&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
Thu Jul 5 09:16:43 2012
@@ -44,7 +44,7 @@ public interface MavenFileFilter
* @throws MavenFilteringException
* @see #getDefaultFilterWrappers(MavenProject, List, boolean,
MavenSession)
*/
- void copyFile( File from, final File to, boolean filtering, MavenProject
mavenProject, List filters,
+ void copyFile( File from, final File to, boolean filtering, MavenProject
mavenProject, List<String> filters,
boolean escapedBackslashesInFilePath, String encoding,
MavenSession mavenSession )
throws MavenFilteringException;
@@ -98,7 +98,7 @@ public interface MavenFileFilter
* @return {@link List} of FileUtils.FilterWrapper
* @deprecated use {@link #getDefaultFilterWrappers(MavenProject, List,
boolean, MavenSession, MavenResourcesExecution)}
*/
- List<FileUtils.FilterWrapper> getDefaultFilterWrappers( MavenProject
mavenProject, List filters,
+ List<FileUtils.FilterWrapper> getDefaultFilterWrappers( MavenProject
mavenProject, List<String> filters,
boolean
escapedBackslashesInFilePath,
MavenSession
mavenSession )
throws MavenFilteringException;
@@ -113,7 +113,7 @@ public interface MavenFileFilter
* @throws MavenFilteringException
* @since 1.0-beta-2
*/
- List<FileUtils.FilterWrapper> getDefaultFilterWrappers( MavenProject
mavenProject, List filters,
+ List<FileUtils.FilterWrapper> getDefaultFilterWrappers( MavenProject
mavenProject, List<String> filters,
boolean
escapedBackslashesInFilePath,
MavenSession
mavenSession,
MavenResourcesExecution mavenResourcesExecution )
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java?rev=1357509&r1=1357508&r2=1357509&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
Thu Jul 5 09:16:43 2012
@@ -45,7 +45,7 @@ public class MavenFileFilterRequest
// nothing
}
- public MavenFileFilterRequest( File from, File to, boolean filtering,
MavenProject mavenProject, List filters,
+ public MavenFileFilterRequest( File from, File to, boolean filtering,
MavenProject mavenProject, List<String> filters,
boolean escapedBackslashesInFilePath,
String encoding, MavenSession mavenSession,
Properties additionalProperties )
{
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java?rev=1357509&r1=1357508&r2=1357509&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
Thu Jul 5 09:16:43 2012
@@ -19,12 +19,8 @@ package org.apache.maven.shared.filterin
* under the License.
*/
-import java.io.File;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.interpolation.Interpolator;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
@@ -33,6 +29,11 @@ import org.codehaus.plexus.interpolation
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.FileUtils.FilterWrapper;
+import java.io.File;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* A bean to configure a resources filtering execution.
*
@@ -42,21 +43,19 @@ import org.codehaus.plexus.util.FileUtil
public class MavenResourcesExecution
extends AbstractMavenFilteringRequest
{
-
- /** @see org.apache.maven.model.Resource */
- private List resources;
+
+ private List<Resource> resources;
private File outputDirectory;
- private List nonFilteredFileExtensions;
+ private List<String> nonFilteredFileExtensions;
- /** @see FileUtils.FilterWrapper */
- private List filterWrappers;
+ private List<FileUtils.FilterWrapper> filterWrappers;
private File resourcesBaseDirectory;
private boolean useDefaultFilterWrappers = false;
-
+
/**
* Overwrite existing files even if the destination files are newer.
* <code>false</code> by default.
@@ -64,26 +63,26 @@ public class MavenResourcesExecution
* @since 1.0-beta-2
*/
private boolean overwrite = false;
-
+
/**
* Copy any empty directories included in the Resources.
*
* @since 1.0-beta-2
*/
private boolean includeEmptyDirs = false;
-
+
/**
* Do not stop trying to filter tokens when reaching EOL.
*
* @since 1.0
*/
- private boolean supportMultiLineFiltering;
-
+ private boolean supportMultiLineFiltering;
+
public MavenResourcesExecution()
{
// no op
}
-
+
/**
* As we use a Maven project <code>useDefaultFilterWrappers</code> will be
set to <code>true</code>.
*
@@ -95,8 +94,9 @@ public class MavenResourcesExecution
* @param nonFilteredFileExtensions
* @param mavenSession
*/
- public MavenResourcesExecution( List resources, File outputDirectory,
MavenProject mavenProject, String encoding,
- List fileFilters, List
nonFilteredFileExtensions, MavenSession mavenSession )
+ public MavenResourcesExecution( List<Resource> resources, File
outputDirectory, MavenProject mavenProject,
+ String encoding, List fileFilters,
List<String> nonFilteredFileExtensions,
+ MavenSession mavenSession )
{
super( mavenProject, fileFilters, encoding, mavenSession );
this.resources = resources;
@@ -106,8 +106,9 @@ public class MavenResourcesExecution
this.resourcesBaseDirectory = mavenProject.getBasedir();
}
- public MavenResourcesExecution( List resources, File outputDirectory,
String encoding, List filterWrappers,
- File resourcesBaseDirectory, List
nonFilteredFileExtensions )
+ public MavenResourcesExecution( List<Resource> resources, File
outputDirectory, String encoding,
+ List<FileUtils.FilterWrapper>
filterWrappers, File resourcesBaseDirectory,
+ List<String> nonFilteredFileExtensions )
{
this();
this.resources = resources;
@@ -119,11 +120,11 @@ public class MavenResourcesExecution
setEncoding( encoding );
}
-
+
/**
* @return List of {@link org.apache.maven.model.Resource}
*/
- public List getResources()
+ public List<Resource> getResources()
{
return resources;
}
@@ -131,7 +132,7 @@ public class MavenResourcesExecution
/**
* @param resources List of {@link org.apache.maven.model.Resource}
*/
- public void setResources( List resources )
+ public void setResources( List<Resource> resources )
{
this.resources = resources;
}
@@ -149,7 +150,7 @@ public class MavenResourcesExecution
/**
* @return List of {@link String} file extensions to not filter
*/
- public List getNonFilteredFileExtensions()
+ public List<String> getNonFilteredFileExtensions()
{
return nonFilteredFileExtensions;
}
@@ -157,7 +158,7 @@ public class MavenResourcesExecution
/**
* @param nonFilteredFileExtensions List of {@link String} file extensions
to not filter
*/
- public void setNonFilteredFileExtensions( List nonFilteredFileExtensions )
+ public void setNonFilteredFileExtensions( List<String>
nonFilteredFileExtensions )
{
this.nonFilteredFileExtensions = nonFilteredFileExtensions;
}
@@ -165,7 +166,7 @@ public class MavenResourcesExecution
/**
* @return List of {@link FileUtils.FilterWrapper}
*/
- public List getFilterWrappers()
+ public List<FileUtils.FilterWrapper> getFilterWrappers()
{
return filterWrappers;
}
@@ -173,25 +174,25 @@ public class MavenResourcesExecution
/**
* @param filterWrappers List of {@link FileUtils.FilterWrapper}
*/
- public void setFilterWrappers( List filterWrappers )
+ public void setFilterWrappers( List<FileUtils.FilterWrapper>
filterWrappers )
{
this.filterWrappers = filterWrappers;
}
-
+
public void addFilterWrapper( FilterWrapper filterWrapper )
{
if ( this.filterWrappers == null )
{
- this.filterWrappers = new ArrayList();
+ this.filterWrappers = new ArrayList<FilterWrapper>();
}
this.filterWrappers.add( filterWrapper );
}
-
+
/**
- * Helper to add {@link FileUtils.FilterWrapper}, will {@link
RegexBasedInterpolator} with default regex Exp ${ }
+ * Helper to add {@link FileUtils.FilterWrapper}, will {@link
RegexBasedInterpolator} with default regex Exp ${ }
* and InterpolatorFilterReaderLineEnding with defaultTokens ${ }.
*
- * @param valueSource
+ * @param valueSource
* @deprecated This doesn't support escaping use {@link
#addFilerWrapperWithEscaping(ValueSource, String, String, String, boolean)}
*/
public void addFilerWrapper( final ValueSource valueSource )
@@ -231,14 +232,14 @@ public class MavenResourcesExecution
false );
}
} );
- }
-
+ }
+
/**
* @param valueSource
- * @param startExp start token like ${
- * @param endExp endToken }
- * @since 1.0-beta-2
+ * @param startExp start token like ${
+ * @param endExp endToken }
* @param escapeString
+ * @since 1.0-beta-2
* @deprecated This doesn't support escaping use {@link
#addFilerWrapperWithEscaping(ValueSource, String, String, String, boolean)}
*/
public void addFilerWrapperWithEscaping( final ValueSource valueSource,
final String startExp, final String endExp,
@@ -251,20 +252,18 @@ public class MavenResourcesExecution
StringSearchInterpolator propertiesInterpolator = new
StringSearchInterpolator( startExp, endExp );
propertiesInterpolator.addValueSource( valueSource );
propertiesInterpolator.setEscapeString( escapeString );
- InterpolatorFilterReaderLineEnding interpolatorFilterReader
- = new InterpolatorFilterReaderLineEnding( reader,
-
propertiesInterpolator,
- startExp,
endExp, false );
+ InterpolatorFilterReaderLineEnding interpolatorFilterReader =
+ new InterpolatorFilterReaderLineEnding( reader,
propertiesInterpolator, startExp, endExp, false );
interpolatorFilterReader.setInterpolateWithPrefixPattern(
false );
return interpolatorFilterReader;
}
} );
- }
-
+ }
+
/**
* @param valueSource
- * @param startExp start token like ${
- * @param endExp endToken }
+ * @param startExp start token like ${
+ * @param endExp endToken }
* @param escapeString
* @param supportMultiLineFiltering do we support or use filtering on
multi lines with start and endtoken on multi lines
* @since 1.0
@@ -279,17 +278,16 @@ public class MavenResourcesExecution
StringSearchInterpolator propertiesInterpolator = new
StringSearchInterpolator( startExp, endExp );
propertiesInterpolator.addValueSource( valueSource );
propertiesInterpolator.setEscapeString( escapeString );
- InterpolatorFilterReaderLineEnding interpolatorFilterReader
- = new InterpolatorFilterReaderLineEnding( reader,
-
propertiesInterpolator,
- startExp,
endExp, supportMultiLineFiltering );
+ InterpolatorFilterReaderLineEnding interpolatorFilterReader =
+ new InterpolatorFilterReaderLineEnding( reader,
propertiesInterpolator, startExp, endExp,
+
supportMultiLineFiltering );
interpolatorFilterReader.setInterpolateWithPrefixPattern(
false );
return interpolatorFilterReader;
}
} );
- }
-
-
+ }
+
+
public File getResourcesBaseDirectory()
{
return resourcesBaseDirectory;
@@ -351,7 +349,7 @@ public class MavenResourcesExecution
{
this.includeEmptyDirs = includeEmptyDirs;
}
-
+
public MavenResourcesExecution copyOf()
{
MavenResourcesExecution mre = new MavenResourcesExecution();
@@ -375,7 +373,7 @@ public class MavenResourcesExecution
mre.setSupportMultiLineFiltering( mre.isSupportMultiLineFiltering() );
return mre;
}
-
+
private List copyList( List lst )
{
if ( lst == null )
Modified:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java?rev=1357509&r1=1357508&r2=1357509&view=diff
==============================================================================
---
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
(original)
+++
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
Thu Jul 5 09:16:43 2012
@@ -19,11 +19,13 @@ package org.apache.maven.shared.filterin
* under the License.
*/
-import java.io.File;
-import java.util.List;
-
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+import java.util.List;
/**
* @author Olivier Lamy
@@ -33,47 +35,49 @@ public interface MavenResourcesFiltering
{
/**
- * @param resources {@link List} of {@link org.apache.maven.model.Resource}
- * @param outputDirectory parent destination directory
- * @param mavenProject the maven project
- * @param encoding encoding to use for writing files
- * @param fileFilters {@link List} of String which are path to a Property
file
+ * @param resources {@link List} of {@link
org.apache.maven.model.Resource}
+ * @param outputDirectory parent destination directory
+ * @param mavenProject the maven project
+ * @param encoding encoding to use for writing files
+ * @param fileFilters {@link List} of String which are path
to a Property file
* @param nonFilteredFileExtensions {@link List} of String for non
filtered file extensions
- * @param mavenSession Can include executionProperties that will be used
for filtering
+ * @param mavenSession Can include executionProperties that
will be used for filtering
* @throws MavenFilteringException
* @deprecated use {@link #filterResources(MavenResourcesExecution)}
*/
- void filterResources( List resources, File outputDirectory, MavenProject
mavenProject, String encoding,
- List fileFilters, List nonFilteredFileExtensions,
MavenSession mavenSession )
+ void filterResources( List<Resource> resources, File outputDirectory,
MavenProject mavenProject, String encoding,
+ List<String> fileFilters, List<String>
nonFilteredFileExtensions, MavenSession mavenSession )
throws MavenFilteringException;
/**
- * @param resources {@link List} of {@link org.apache.maven.model.Resource}
- * @param outputDirectory parent destination directory
- * @param encoding encoding to use for writing files
- * @param filterWrappers {@link List} of FileUtils.FilterWrapper
- * @param resourcesBaseDirectory baseDirectory of resources
+ * @param resources {@link List} of {@link
org.apache.maven.model.Resource}
+ * @param outputDirectory parent destination directory
+ * @param encoding encoding to use for writing files
+ * @param filterWrappers {@link List} of FileUtils.FilterWrapper
+ * @param resourcesBaseDirectory baseDirectory of resources
* @param nonFilteredFileExtensions {@link List} of String for non
filtered file extensions
* @throws MavenFilteringException
* @deprecated use {@link #filterResources(MavenResourcesExecution)}
*/
- void filterResources( List resources, File outputDirectory, String
encoding, List filterWrappers,
- File resourcesBaseDirectory, List
nonFilteredFileExtensions )
+ void filterResources( List<Resource> resources, File outputDirectory,
String encoding,
+ List<FileUtils.FilterWrapper> filterWrappers, File
resourcesBaseDirectory,
+ List<String> nonFilteredFileExtensions )
throws MavenFilteringException;
/**
* return the List of the non filtered extensions (jpg,jpeg,gif,bmp,png)
+ *
* @return {@link List} of {@link String}
*/
List getDefaultNonFilteredFileExtensions();
/**
- * @param fileName the file name
+ * @param fileName the file name
* @param userNonFilteredFileExtensions an extra list of file extensions
* @return true if filtering can be applied to the file (means
extensions.lowerCase is in the
* default List or in the user defined extension List)
*/
- boolean filteredFileExtension( String fileName, List
userNonFilteredFileExtensions );
+ boolean filteredFileExtension( String fileName, List<String>
userNonFilteredFileExtensions );
/**
* @param mavenResourcesExecution {@link MavenResourcesExecution}
