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 2009/07/28 01:17:08 UTC
svn commit: r798327 - in /maven/shared/trunk/maven-filtering/src:
main/java/org/apache/maven/shared/filtering/
test/java/org/apache/maven/shared/filtering/
test/units-files/maven-resources-filtering/
Author: olamy
Date: Mon Jul 27 23:17:08 2009
New Revision: 798327
URL: http://svn.apache.org/viewvc?rev=798327&view=rev
Log:
New Properties to be able to add properties "on fly" without modifying project.properties (related to [MCHANGES-161])
Added:
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java (with props)
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/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/maven-resources-filtering.txt
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=798327&r1=798326&r2=798327&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 Mon Jul 27 23:17:08 2009
@@ -58,9 +58,24 @@
throws MavenFilteringException
{
List filterWrappers = getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath,
- mavenSession );
+ mavenSession, null );
copyFile( from, to, filtering, filterWrappers, encoding );
}
+
+
+ public void copyFile( MavenFileFilterRequest mavenFileFilterRequest )
+ throws MavenFilteringException
+ {
+ List filterWrappers =
+ getDefaultFilterWrappers( mavenFileFilterRequest.getMavenProject(), mavenFileFilterRequest.getFilters(),
+ mavenFileFilterRequest.isEscapedBackslashesInFilePath(),
+ mavenFileFilterRequest.getMavenSession(), null,
+ mavenFileFilterRequest.getAdditionnalProperties() );
+ copyFile( mavenFileFilterRequest.getFrom(), mavenFileFilterRequest.getTo(),
+ mavenFileFilterRequest.isFiltering(), filterWrappers, mavenFileFilterRequest.getEncoding() );
+ }
+
+
public void copyFile( File from, File to, boolean filtering, List filterWrappers, String encoding )
throws MavenFilteringException
@@ -123,9 +138,20 @@
MavenResourcesExecution mavenResourcesExecution )
throws MavenFilteringException
{
-
+
+ return getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath, mavenSession,
+ mavenResourcesExecution, null );
+
+ }
+
+ public List getDefaultFilterWrappers( final MavenProject mavenProject, List filters,
+ final boolean escapedBackslashesInFilePath, MavenSession mavenSession,
+ MavenResourcesExecution mavenResourcesExecution, Properties additionnalProperties )
+ throws MavenFilteringException
+ {
+
// here we build some properties which will be used to read some properties files
- // to interpolate the expression ${ } in this properties file
+ // to interpolate the expression ${ } in this properties file
// Take a copy of filterProperties to ensure that evaluated filterTokens are not propagated
// to subsequent filter files. NB this replicates current behaviour and seems to make sense.
@@ -133,10 +159,10 @@
final Properties baseProps = new Properties();
// Project properties
- if(mavenProject != null)
+ if ( mavenProject != null )
{
- baseProps.putAll( mavenProject.getProperties() == null ? Collections.EMPTY_MAP : mavenProject
- .getProperties() );
+ baseProps.putAll( mavenProject.getProperties() == null ? Collections.EMPTY_MAP
+ : mavenProject.getProperties() );
}
// TODO this is NPE free but do we consider this as normal
// or do we have to throw an MavenFilteringException with mavenSession cannot be null
@@ -152,13 +178,13 @@
loadProperties( filterProperties, filters, baseProps );
- if(mavenProject != null)
+ if ( mavenProject != null )
{
loadProperties( filterProperties, mavenProject.getBuild().getFilters(), baseProps );
- // Project properties
- filterProperties.putAll( mavenProject.getProperties() == null ? Collections.EMPTY_MAP : mavenProject
- .getProperties() );
+ // Project properties
+ filterProperties.putAll( mavenProject.getProperties() == null ? Collections.EMPTY_MAP
+ : mavenProject.getProperties() );
}
if ( mavenSession != null )
{
@@ -166,26 +192,32 @@
filterProperties.putAll( mavenSession.getExecutionProperties() );
}
+ if ( additionnalProperties != null )
+ {
+ // additionnal properties wins
+ filterProperties.putAll( additionnalProperties );
+ }
+
List defaultFilterWrappers = new ArrayList( 3 );
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "properties used " + filterProperties );
}
-
+
final ValueSource propertiesValueSource =
new PropertiesEscapingBackSlashValueSource( escapedBackslashesInFilePath, filterProperties );
- final String escapeString = mavenResourcesExecution == null ? null : mavenResourcesExecution.getEscapeString();
-
-
+ final String escapeString = mavenResourcesExecution == null ? null : mavenResourcesExecution.getEscapeString();
+
// support ${token}
FileUtils.FilterWrapper one = new FileUtils.FilterWrapper()
{
public Reader getReader( Reader reader )
{
StringSearchInterpolator propertiesInterpolator = new StringSearchInterpolator();
- MavenProjectValueSource valueSource = new MavenProjectValueSource( mavenProject, escapedBackslashesInFilePath );
+ MavenProjectValueSource valueSource =
+ new MavenProjectValueSource( mavenProject, escapedBackslashesInFilePath );
valueSource.setPropertiesValueSource( propertiesValueSource );
propertiesInterpolator.addValueSource( valueSource );
propertiesInterpolator.setEscapeString( escapeString );
@@ -203,12 +235,13 @@
public Reader getReader( Reader reader )
{
StringSearchInterpolator propertiesInterpolator = new StringSearchInterpolator( "@", "@" );
- MavenProjectValueSource valueSource = new MavenProjectValueSource( mavenProject, escapedBackslashesInFilePath );
+ MavenProjectValueSource valueSource =
+ new MavenProjectValueSource( mavenProject, escapedBackslashesInFilePath );
valueSource.setPropertiesValueSource( propertiesValueSource );
propertiesInterpolator.addValueSource( valueSource );
propertiesInterpolator.setEscapeString( escapeString );
- InterpolatorFilterReader filterReader = new InterpolatorFilterReader( reader, propertiesInterpolator,
- "@", "@" );
+ InterpolatorFilterReader filterReader =
+ new InterpolatorFilterReader( reader, propertiesInterpolator, "@", "@" );
filterReader.setInterpolateWithPrefixPattern( false );
filterReader.setEscapeString( escapeString );
return filterReader;
@@ -217,9 +250,9 @@
defaultFilterWrappers.add( second );
return defaultFilterWrappers;
- }
+ }
- private void loadProperties( Properties filterProperties, List /*String*/propertiesFilePaths, Properties baseProps )
+ private void loadProperties( Properties filterProperties, List /* String */propertiesFilePaths, Properties baseProps )
throws MavenFilteringException
{
if ( propertiesFilePaths != null )
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=798327&r1=798326&r2=798327&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 Mon Jul 27 23:17:08 2009
@@ -29,7 +29,6 @@
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
-import org.sonatype.plexus.build.incremental.BuildContext;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -37,6 +36,7 @@
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.Scanner;
import org.codehaus.plexus.util.StringUtils;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
@@ -156,10 +156,13 @@
{
filterWrappers.addAll( mavenResourcesExecution.getFilterWrappers() );
}
- filterWrappers.addAll( mavenFileFilter.getDefaultFilterWrappers( mavenResourcesExecution.getMavenProject(),
+ filterWrappers.addAll( mavenFileFilter.getDefaultFilterWrappers(
+ mavenResourcesExecution.getMavenProject(),
mavenResourcesExecution.getFileFilters(),
- true, mavenResourcesExecution
- .getMavenSession(), mavenResourcesExecution ) );
+ true,
+ mavenResourcesExecution.getMavenSession(),
+ mavenResourcesExecution,
+ mavenResourcesExecution.getAdditionnalProperies() ) );
mavenResourcesExecution.setFilterWrappers( filterWrappers );
}
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=798327&r1=798326&r2=798327&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 Mon Jul 27 23:17:08 2009
@@ -21,6 +21,7 @@
import java.io.File;
import java.util.List;
+import java.util.Properties;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
@@ -46,6 +47,14 @@
void copyFile( File from, final File to, boolean filtering, MavenProject mavenProject, List filters,
boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession )
throws MavenFilteringException;
+
+ /**
+ * @since 1.0-beta-3
+ * @param mavenFileFilterRequest
+ * @throws MavenFilteringException
+ */
+ void copyFile( MavenFileFilterRequest mavenFileFilterRequest )
+ throws MavenFilteringException;
/**
* @param from
@@ -105,5 +114,21 @@
*/
List getDefaultFilterWrappers( MavenProject mavenProject, List filters, boolean escapedBackslashesInFilePath,
MavenSession mavenSession, MavenResourcesExecution mavenResourcesExecution )
- throws MavenFilteringException;
+ throws MavenFilteringException;
+
+ /**
+ * @since 1.0-beta-3
+ * @param mavenProject
+ * @param filters
+ * @param escapedBackslashesInFilePath
+ * @param mavenSession
+ * @param mavenResourcesExecution
+ * @param additionnalProperties properties which can override ones calculated from maven
+ * @return {@link List} of FileUtils.FilterWrapper
+ * @throws MavenFilteringException
+ */
+ List getDefaultFilterWrappers( MavenProject mavenProject, List filters, boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession, MavenResourcesExecution mavenResourcesExecution,
+ Properties additionnalProperties )
+ throws MavenFilteringException;
}
Added: 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=798327&view=auto
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java (added)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java Mon Jul 27 23:17:08 2009
@@ -0,0 +1,166 @@
+package org.apache.maven.shared.filtering;
+
+import java.io.File;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.project.MavenProject;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @author <a href="mailto:olamy@apache">olamy</a>
+ *
+ * @since 1.0-beta-3
+ */
+public class MavenFileFilterRequest
+{
+
+ private File from;
+
+ private File to;
+
+ private boolean filtering;
+
+ private MavenProject mavenProject;
+
+ private List filters;
+
+ private boolean escapedBackslashesInFilePath;
+
+ private String encoding;
+
+ private MavenSession mavenSession;
+
+ private Properties additionnalProperties;
+
+ public MavenFileFilterRequest()
+ {
+ // nothing
+ }
+
+ public MavenFileFilterRequest( File from, File to, boolean filtering, MavenProject mavenProject, List filters,
+ boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession,
+ Properties additionnalProperties )
+ {
+ this.from = from;
+ this.to = to;
+ this.filtering = filtering;
+ this.mavenProject = mavenProject;
+ this.filters = filters;
+ this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
+ this.encoding = encoding;
+ this.mavenSession = mavenSession;
+ this.additionnalProperties = additionnalProperties;
+ }
+
+
+ public File getFrom()
+ {
+ return from;
+ }
+
+ public void setFrom( File from )
+ {
+ this.from = from;
+ }
+
+ public File getTo()
+ {
+ return to;
+ }
+
+ public void setTo( File to )
+ {
+ this.to = to;
+ }
+
+ public boolean isFiltering()
+ {
+ return filtering;
+ }
+
+ public void setFiltering( boolean filtering )
+ {
+ this.filtering = filtering;
+ }
+
+ public MavenProject getMavenProject()
+ {
+ return mavenProject;
+ }
+
+ public void setMavenProject( MavenProject mavenProject )
+ {
+ this.mavenProject = mavenProject;
+ }
+
+ public List getFilters()
+ {
+ return filters;
+ }
+
+ public void setFilters( List filters )
+ {
+ this.filters = filters;
+ }
+
+ public boolean isEscapedBackslashesInFilePath()
+ {
+ return escapedBackslashesInFilePath;
+ }
+
+ public void setEscapedBackslashesInFilePath( boolean escapedBackslashesInFilePath )
+ {
+ this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
+ }
+
+ public String getEncoding()
+ {
+ return encoding;
+ }
+
+ public void setEncoding( String encoding )
+ {
+ this.encoding = encoding;
+ }
+
+ public MavenSession getMavenSession()
+ {
+ return mavenSession;
+ }
+
+ public void setMavenSession( MavenSession mavenSession )
+ {
+ this.mavenSession = mavenSession;
+ }
+
+ public Properties getAdditionnalProperties()
+ {
+ return additionnalProperties;
+ }
+
+ public void setAdditionnalProperties( Properties additionnalProperties )
+ {
+ this.additionnalProperties = additionnalProperties;
+ }
+
+}
Propchange: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Revision Id
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=798327&r1=798326&r2=798327&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 Mon Jul 27 23:17:08 2009
@@ -23,6 +23,7 @@
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
@@ -57,6 +58,7 @@
private MavenSession mavenSession;
+ /** @see FileUtils.FilterWrapper */
private List filterWrappers;
private File resourcesBaseDirectory;
@@ -89,6 +91,12 @@
*/
private boolean includeEmptyDirs = false;
+ /**
+ *
+ * @since 1.0-beta-3
+ */
+ private Properties additionnalProperies;
+
public MavenResourcesExecution()
{
projectStartExpressions.add( "pom" );
@@ -409,5 +417,15 @@
{
this.includeEmptyDirs = includeEmptyDirs;
}
+
+ public Properties getAdditionnalProperies()
+ {
+ return additionnalProperies;
+ }
+
+ public void setAdditionnalProperies( Properties additionnalProperies )
+ {
+ this.additionnalProperies = additionnalProperies;
+ }
}
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=798327&r1=798326&r2=798327&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 Mon Jul 27 23:17:08 2009
@@ -90,7 +90,7 @@
mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
nonFilteredFileExtensions, new StubMavenSession() );
- assertFiltering( baseDir, initialImageFile, false );
+ assertFiltering( baseDir, initialImageFile, false, false );
}
public void testWithMavenResourcesExecution()
@@ -128,10 +128,52 @@
nonFilteredFileExtensions, new StubMavenSession() );
mavenResourcesExecution.setEscapeString( "\\" );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
- assertFiltering( baseDir, initialImageFile, true );
+ assertFiltering( baseDir, initialImageFile, true, false );
}
- private void assertFiltering( File baseDir, File initialImageFile, boolean escapeTest )
+ public void testWithMavenResourcesExecutionWithAdditionnalProperties()
+ throws Exception
+ {
+ File baseDir = new File( "c:\\foo\\bar" );
+ StubMavenProject mavenProject = new StubMavenProject( baseDir );
+ mavenProject.setVersion( "1.0" );
+ mavenProject.setGroupId( "org.apache" );
+ mavenProject.setName( "test project" );
+
+ Properties projectProperties = new Properties();
+ projectProperties.put( "foo", "bar" );
+ projectProperties.put( "java.version", "zloug" );
+ mavenProject.setProperties( projectProperties );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
+
+ String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
+ File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
+
+ Resource resource = new Resource();
+ List resources = new ArrayList();
+ resources.add( resource );
+ resource.setDirectory( unitFilesDir );
+ resource.setFiltering( true );
+
+ List filtersFile = new ArrayList();
+ filtersFile.add( getBasedir()
+ + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
+
+ List nonFilteredFileExtensions = Collections.singletonList( "gif" );
+ Properties additionnalProperties = new Properties();
+ additionnalProperties.put( "greatDate", "1973-06-14" );
+ additionnalProperties.put( "pom.version", "99.00" );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ nonFilteredFileExtensions, new StubMavenSession() );
+ mavenResourcesExecution.setAdditionnalProperies( additionnalProperties );
+ mavenResourcesExecution.setEscapeString( "\\" );
+ mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ assertFiltering( baseDir, initialImageFile, true, true );
+ }
+
+ private void assertFiltering( File baseDir, File initialImageFile, boolean escapeTest, boolean additionnalProperties )
throws Exception
{
assertEquals( 7, outputDirectory.listFiles().length );
@@ -162,7 +204,15 @@
}
assertFalse( result.isEmpty() );
- assertEquals( "1.0", result.get( "version" ) );
+ if ( additionnalProperties )
+ {
+ assertEquals( "1973-06-14", result.getProperty( "goodDate" ) );
+ assertEquals( "99.00", result.get( "version" ) );
+ }
+ else
+ {
+ assertEquals( "1.0", result.get( "version" ) );
+ }
assertEquals( "org.apache", result.get( "groupId" ) );
assertEquals( "bar", result.get( "foo" ) );
assertEquals( "${foo.version}", result.get( "fooVersion" ) );
@@ -236,7 +286,7 @@
PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null );
assertFalse( result.isEmpty() );
assertEquals( mavenProject.getName(), result.get( "pomName" ) );
- assertFiltering( baseDir, initialImageFile, false );
+ assertFiltering( baseDir, initialImageFile, false, false );
}
public void testNoFiltering()
Modified: maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/maven-resources-filtering.txt
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/maven-resources-filtering.txt?rev=798327&r1=798326&r2=798327&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/maven-resources-filtering.txt (original)
+++ maven/shared/trunk/maven-filtering/src/test/units-files/maven-resources-filtering/maven-resources-filtering.txt Mon Jul 27 23:17:08 2009
@@ -31,4 +31,6 @@
escapeJavaVersion=\${java.version}
escapeuserDir=\@user.dir@
-userHome=${user.home}
\ No newline at end of file
+userHome=${user.home}
+
+goodDate=${greatDate}
\ No newline at end of file