Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use ${..} style interpolation 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163381 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-02-23 03:56:25 +00:00
parent 4465e49559
commit c022a8807d
3 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
View File

@ -23,6 +23,7 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.util.introspection.ReflectionValueExtractor;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
import java.io.StringReader;
import java.io.StringWriter;
@ -37,12 +38,13 @@ public class RegexBasedModelInterpolator
implements ModelInterpolator
{
private static final Pattern EXPRESSION_PATTERN = Pattern.compile( "#([A-Za-z.]+)" );
private static final Pattern EXPRESSION_PATTERN = Pattern.compile( "\\$\\{([^}]+)\\}" );
/**
* Added: Feb 3, 2005 by jdcasey
*/
public Model interpolate( Model model ) throws ModelInterpolationException
public Model interpolate( Model model )
throws ModelInterpolationException
{
StringWriter sWriter = new StringWriter();
@ -51,10 +53,9 @@ public class RegexBasedModelInterpolator
{
writer.write( sWriter, model );
}
catch( Exception e )
catch ( Exception e )
{
throw new ModelInterpolationException(
"Cannot serialize project model for interpolation.", e );
throw new ModelInterpolationException( "Cannot serialize project model for interpolation.", e );
}
String serializedModel = sWriter.toString();
@ -67,7 +68,7 @@ public class RegexBasedModelInterpolator
{
model = modelReader.read( sReader );
}
catch( Exception e )
catch ( Exception e )
{
throw new ModelInterpolationException(
"Cannot read project model from interpolating filter of serialized version.", e );
@ -83,7 +84,7 @@ public class RegexBasedModelInterpolator
{
String result = src;
Matcher matcher = EXPRESSION_PATTERN.matcher( result );
while( matcher.find() )
while ( matcher.find() )
{
String wholeExpr = matcher.group( 0 );
String realExpr = matcher.group( 1 );
@ -93,19 +94,21 @@ public class RegexBasedModelInterpolator
{
value = String.valueOf( ReflectionValueExtractor.evaluate( realExpr, model ) );
}
catch( Exception e )
catch ( Exception e )
{
Logger logger = getLogger();
if( logger != null )
if ( logger != null )
{
logger.debug( "POM interpolation cannot proceed with expression: " + wholeExpr
+ ". Skipping...", e );
logger.debug( "POM interpolation cannot proceed with expression: " + wholeExpr + ". Skipping...", e );
}
}
if( value != null )
if ( value != null )
{
result = result.replaceAll( wholeExpr, value );
result = StringUtils.replace( result, wholeExpr, value );
// could use:
// result = matcher.replaceFirst( value );
// but this could result in multiple lookups of value, and replaceAll is not correct behaviour
matcher.reset( result );
}
}

2
maven-core/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
View File

@ -32,7 +32,7 @@
<!-- This all may just fold into plugin parameters -->
<directory>target</directory>
<output>target/classes</output>
<finalName>#artifactId-#version</finalName>
<finalName>${artifactId}-${version}</finalName>
<testOutput>target/test-classes</testOutput>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>

23
maven-core/src/test/java/org/apache/maven/project/interpolation/RegexBasedProjectInterpolatorTest.java
View File

@ -37,7 +37,7 @@ public class RegexBasedProjectInterpolatorTest
model.setVersion( "3.8.1" );
Dependency dep = new Dependency();
dep.setVersion( "#version" );
dep.setVersion( "${version}" );
model.addDependency( dep );
@ -53,13 +53,30 @@ public class RegexBasedProjectInterpolatorTest
model.setVersion( "3.8.1" );
Dependency dep = new Dependency();
dep.setVersion( "#something" );
dep.setVersion( "${something}" );
model.addDependency( dep );
Model out = new RegexBasedModelInterpolator().interpolate( model );
assertEquals( "#something", ((Dependency) out.getDependencies().get( 0 )).getVersion() );
assertEquals( "${something}", ((Dependency) out.getDependencies().get( 0 )).getVersion() );
}
public void testTwoReferences()
throws ModelInterpolationException
{
Model model = new Model();
model.setVersion( "3.8.1" );
model.setArtifactId( "foo" );
Dependency dep = new Dependency();
dep.setVersion( "${artifactId}-${version}" );
model.addDependency( dep );
Model out = new RegexBasedModelInterpolator().interpolate( model );
assertEquals( "foo-3.8.1", ((Dependency) out.getDependencies().get( 0 )).getVersion() );
}
}