This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to annotated tag maven-filtering-1.0-alpha-1 in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit a8cec412e87435713493847f7924826fe6dc22bb Author: Oliver Lamy <[email protected]> AuthorDate: Sat Jul 26 02:15:23 2008 +0000 fix checstyle errors git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk/shared/maven-filtering@679946 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/shared/filtering/CompositeMap.java | 2 +- .../maven/shared/filtering/DefaultMavenFileFilter.java | 12 ++++++------ .../shared/filtering/DefaultMavenResourcesFiltering.java | 16 +++++++++------- .../apache/maven/shared/filtering/FilteringUtils.java | 14 +++++--------- .../apache/maven/shared/filtering/MavenFileFilter.java | 6 +++--- .../maven/shared/filtering/MavenResourcesExecution.java | 4 ++-- .../filtering/PropertiesEscapingBackSlahValueSource.java | 6 +++--- 7 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java b/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java index 6be53de..157cace 100755 --- a/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java +++ b/src/main/java/org/apache/maven/shared/filtering/CompositeMap.java @@ -54,7 +54,7 @@ public class CompositeMap /** * @param maps an orderer {@link List} of {@link Map} * @param useSystemProperties using or not the System Properties - * @param systemPropertiesFirst if with get( key ) the systemProperties must wins (the internal ordered {@link List} + * @param systemPropertiesFirst if with get( key ) the sysProps must wins (the internal ordered {@link List} * will have in first the System Properties) */ public CompositeMap( List /*Map*/maps, boolean useSystemProperties, boolean systemPropertiesFirst ) diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java index cc5e4db..17bf524 100755 --- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java +++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java @@ -53,7 +53,8 @@ public class DefaultMavenFileFilter boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession ) throws MavenFilteringException { - List filterWrappers = getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath, mavenSession ); + List filterWrappers = getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath, + mavenSession ); copyFile( from, to, filtering, filterWrappers, encoding ); } @@ -126,9 +127,8 @@ public class DefaultMavenFileFilter List defaultFilterWrappers = new ArrayList( 3 ); - final ValueSource propertiesValueSource = new PropertiesEscapingBackSlahValueSource( - escapedBackslashesInFilePath, - filterProperties ); + final ValueSource propertiesValueSource = + new PropertiesEscapingBackSlahValueSource( escapedBackslashesInFilePath, filterProperties ); // support ${token} @@ -148,7 +148,7 @@ public class DefaultMavenFileFilter { public Reader getReader( Reader reader ) { - final Interpolator propertiesInterpolatorAtRegex = new RegexBasedInterpolator("\\@", "(.+?)\\@"); + final Interpolator propertiesInterpolatorAtRegex = new RegexBasedInterpolator( "\\@", "(.+?)\\@" ); propertiesInterpolatorAtRegex.addValueSource( propertiesValueSource ); return new InterpolatorFilterReader( reader, propertiesInterpolatorAtRegex, "@", "@" ); } @@ -174,7 +174,7 @@ public class DefaultMavenFileFilter { public Reader getReader( Reader reader ) { - Interpolator mavenProjectInterpolator = new RegexBasedInterpolator("\\@", "(.+?)\\@"); + Interpolator mavenProjectInterpolator = new RegexBasedInterpolator( "\\@", "(.+?)\\@" ); ValueSource valueSource = new MavenProjectValueSource( mavenProject, escapedBackslashesInFilePath ); mavenProjectInterpolator.addValueSource( valueSource ); diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java index 54a468b..3ec1bae 100755 --- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java +++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java @@ -153,11 +153,15 @@ public class DefaultMavenResourcesFiltering if ( mavenResourcesExecution.getEncoding() == null || mavenResourcesExecution.getEncoding().length() < 1 ) { - getLogger().info( "Using platform encoding (" + ReaderFactory.FILE_ENCODING + " actually) to copy filtered resources." ); + getLogger().info( + "Using platform encoding (" + ReaderFactory.FILE_ENCODING + + " actually) to copy filtered resources." ); } else { - getLogger().info( "Using '" + mavenResourcesExecution.getEncoding() + "' encoding to copy filtered resources." ); + getLogger().info( + "Using '" + mavenResourcesExecution.getEncoding() + + "' encoding to copy filtered resources." ); } for ( Iterator i = mavenResourcesExecution.getResources().iterator(); i.hasNext(); ) @@ -183,12 +187,10 @@ public class DefaultMavenResourcesFiltering // this part is required in case the user specified "../something" as destination // see MNG-1345 File outputDirectory = mavenResourcesExecution.getOutputDirectory(); - if ( !outputDirectory.exists() ) + if ( !outputDirectory.exists() && !outputDirectory.mkdirs() ) { - if ( !outputDirectory.mkdirs() ) - { - throw new MavenFilteringException( "Cannot create resource output directory: " + outputDirectory ); - } + throw new MavenFilteringException( "Cannot create resource output directory: " + outputDirectory ); + } DirectoryScanner scanner = new DirectoryScanner(); diff --git a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java index f28fc87..990d9ee 100755 --- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java +++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java @@ -1,7 +1,5 @@ package org.apache.maven.shared.filtering; -import org.codehaus.plexus.util.StringUtils; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,6 +19,8 @@ import org.codehaus.plexus.util.StringUtils; * under the License. */ +import org.codehaus.plexus.util.StringUtils; + /** * @author <a href="mailto:[email protected]";>olamy</a> * @since 21 juil. 2008 @@ -39,14 +39,10 @@ public class FilteringUtils public static final String escapeWindowsPath( String val ) { - if ( !StringUtils.isEmpty( val ) ) + if ( !StringUtils.isEmpty( val ) && val.indexOf( ":\\" ) == 1 ) { - // Check if it's a windows path - if ( val.indexOf( ":\\" ) == 1 ) - { - val = StringUtils.replace( (String) val, "\\", "\\\\" ); - val = StringUtils.replace( (String) val, ":", "\\:" ); - } + val = StringUtils.replace( (String) val, "\\", "\\\\" ); + val = StringUtils.replace( (String) val, ":", "\\:" ); } return val; } diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java index 1620159..d1bc248 100755 --- a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java +++ b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java @@ -63,9 +63,9 @@ public interface MavenFileFilter * Will return the default FileUtils.FilterWrappers * * <ul> - * <li>interpolation with token ${ } and values from SystemProps, project.properties, from filters and project filters.</li> - * <li>interpolation with token @ @ and values from SystemProps, project.properties, from filters and project filters.</li> - * <li>interpolation with token ${ } and values from mavenProject interpolation.</li> + * <li>interpolate with token ${} and values from sysProps, project.properties, filters and project filters.</li> + * <li>interpolate with token @ @ and values from sysProps, project.properties, filters and project filters.</li> + * <li>interpolate with token ${} and values from mavenProject interpolation.</li> * </ul> * * @param mavenProject diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java index 2e5e63d..441959f 100755 --- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java +++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java @@ -1,3 +1,5 @@ +package org.apache.maven.shared.filtering; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -16,7 +18,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.maven.shared.filtering; import java.io.File; import java.io.Reader; @@ -24,7 +25,6 @@ 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.InterpolatorFilterReader; diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertiesEscapingBackSlahValueSource.java b/src/main/java/org/apache/maven/shared/filtering/PropertiesEscapingBackSlahValueSource.java index bc98355..76b6afb 100755 --- a/src/main/java/org/apache/maven/shared/filtering/PropertiesEscapingBackSlahValueSource.java +++ b/src/main/java/org/apache/maven/shared/filtering/PropertiesEscapingBackSlahValueSource.java @@ -33,13 +33,13 @@ public class PropertiesEscapingBackSlahValueSource { private boolean escapedBackslashesInFilePath; - + private Properties properties; - + /** * */ - public PropertiesEscapingBackSlahValueSource(boolean escapedBackslashesInFilePath, Properties properties) + public PropertiesEscapingBackSlahValueSource( boolean escapedBackslashesInFilePath, Properties properties ) { this.escapedBackslashesInFilePath = escapedBackslashesInFilePath; this.properties = properties == null ? new Properties() : properties;
