You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/06/26 18:32:23 UTC
svn commit: r671934 -
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
Author: jdcasey
Date: Thu Jun 26 09:32:23 2008
New Revision: 671934
URL: http://svn.apache.org/viewvc?rev=671934&view=rev
Log:
Removing debug output, and collapsing duplicate code into delegation for deprecated interpolate method.
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?rev=671934&r1=671933&r2=671934&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java Thu Jun 26 09:32:23 2008
@@ -120,48 +120,13 @@
public Model interpolate( Model model, Map context, boolean strict )
throws ModelInterpolationException
{
- StringWriter sWriter = new StringWriter();
-
- MavenXpp3Writer writer = new MavenXpp3Writer();
- try
- {
- writer.write( sWriter, model );
- }
- catch ( IOException e )
- {
- throw new ModelInterpolationException( "Cannot serialize project model for interpolation.", e );
- }
-
- String serializedModel = sWriter.toString();
-
Properties props = new Properties();
props.putAll( context );
- serializedModel = interpolate( serializedModel,
- model,
- null,
- new DefaultProjectBuilderConfiguration().setExecutionProperties( props ),
- true );
-
- StringReader sReader = new StringReader( serializedModel );
-
- MavenXpp3Reader modelReader = new MavenXpp3Reader();
- try
- {
- model = modelReader.read( sReader );
- }
- catch ( IOException e )
- {
- throw new ModelInterpolationException(
- "Cannot read project model from interpolating filter of serialized version.", e );
- }
- catch ( XmlPullParserException e )
- {
- throw new ModelInterpolationException(
- "Cannot read project model from interpolating filter of serialized version.", e );
- }
-
- return model;
+ return interpolate( model,
+ null,
+ new DefaultProjectBuilderConfiguration().setExecutionProperties( props ),
+ true );
}
public Model interpolate( Model model,
@@ -229,11 +194,6 @@
{
Logger logger = getLogger();
- if ( logger != null && logger.isDebugEnabled() && projectDir == null )
- {
- logger.debug( "Null project directory from:", new Throwable() );
- }
-
String timestampFormat = DEFAULT_BUILD_TIMESTAMP_FORMAT;
Properties modelProperties = model.getProperties();