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/07/17 00:16:00 UTC
svn commit: r677447 - in /maven/components/branches/maven-2.0.10-RC: ./
maven-project/src/main/java/org/apache/maven/project/interpolation/
maven-project/src/test/java/org/apache/maven/project/interpolation/
Author: jdcasey
Date: Wed Jul 16 15:15:57 2008
New Revision: 677447
URL: http://svn.apache.org/viewvc?rev=677447&view=rev
Log:
[MNG-3536] Upgrading to new plexus-interpolation release to enable path translation as a post-processing step when resolving an individual expression inside the pom. post-processing will happen after a given expression is resolved recursively, and will act on the resulting value.
Added:
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java (with props)
Removed:
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingValueSource.java
Modified:
maven/components/branches/maven-2.0.10-RC/ (props changed)
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
maven/components/branches/maven-2.0.10-RC/pom.xml
Propchange: maven/components/branches/maven-2.0.10-RC/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jul 16 15:15:57 2008
@@ -1,3 +1,4 @@
+bootstrap`
release.properties
maven.log
target
Added: maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java?rev=677447&view=auto
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java (added)
+++ maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java Wed Jul 16 15:15:57 2008
@@ -0,0 +1,60 @@
+package org.apache.maven.project.interpolation;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.project.path.PathTranslator;
+import org.codehaus.plexus.interpolation.AbstractFunctionValueSourceWrapper;
+import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
+import org.codehaus.plexus.interpolation.ValueSource;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ *
+ * @version $Id$
+ */
+public class PathTranslatingPostProcessor
+ implements InterpolationPostProcessor
+{
+
+ private final List unprefixedPathKeys;
+ private final File projectDir;
+ private final PathTranslator pathTranslator;
+
+ public PathTranslatingPostProcessor( List unprefixedPathKeys, File projectDir, PathTranslator pathTranslator )
+ {
+ this.unprefixedPathKeys = unprefixedPathKeys;
+ this.projectDir = projectDir;
+ this.pathTranslator = pathTranslator;
+ }
+
+ public Object execute( String expression,
+ Object value )
+ {
+ if ( projectDir != null && value != null && unprefixedPathKeys.contains( expression ) )
+ {
+ return pathTranslator.alignToBaseDirectory( String.valueOf( value ), projectDir );
+ }
+
+ return value;
+ }
+
+}
Propchange: maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?rev=677447&r1=677446&r2=677447&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java Wed Jul 16 15:15:57 2008
@@ -89,6 +89,12 @@
public RegexBasedModelInterpolator( Properties envars )
{
}
+
+ // for testing.
+ protected RegexBasedModelInterpolator( PathTranslator pathTranslator )
+ {
+ this.pathTranslator = pathTranslator;
+ }
/**
* @todo: Remove the throws clause.
@@ -202,15 +208,8 @@
timestampFormat = modelProperties.getProperty( BUILD_TIMESTAMP_FORMAT_PROPERTY, timestampFormat );
}
- ValueSource baseModelValueSource1 = new PrefixedObjectValueSource( PROJECT_PREFIXES, model, false );
- ValueSource modelValueSource1 = new PathTranslatingValueSource( baseModelValueSource1,
- TRANSLATED_PATH_EXPRESSIONS,
- projectDir, pathTranslator );
-
- ValueSource baseModelValueSource2 = new ObjectBasedValueSource( model );
- ValueSource modelValueSource2 = new PathTranslatingValueSource( baseModelValueSource2,
- TRANSLATED_PATH_EXPRESSIONS,
- projectDir, pathTranslator );
+ ValueSource modelValueSource1 = new PrefixedObjectValueSource( PROJECT_PREFIXES, model, false );
+ ValueSource modelValueSource2 = new ObjectBasedValueSource( model );
ValueSource basedirValueSource = new PrefixedValueSourceWrapper( new ValueSource(){
public Object getValue( String expression )
@@ -235,6 +234,11 @@
interpolator.addValueSource( new PrefixedValueSourceWrapper( new MapBasedValueSource( modelProperties ), PROJECT_PREFIXES, true ) );
interpolator.addValueSource( modelValueSource2 );
interpolator.addValueSource( new MapBasedValueSource( config.getUserProperties() ) );
+
+ PathTranslatingPostProcessor pathTranslatingPostProcessor =
+ new PathTranslatingPostProcessor( TRANSLATED_PATH_EXPRESSIONS, projectDir, pathTranslator );
+
+ interpolator.addPostProcessor( pathTranslatingPostProcessor );
RecursionInterceptor recursionInterceptor = new PrefixAwareRecursionInterceptor( PROJECT_PREFIXES );
Modified: maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java?rev=677447&r1=677446&r2=677447&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java Wed Jul 16 15:15:57 2008
@@ -27,6 +27,8 @@
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.project.DefaultProjectBuilderConfiguration;
+import org.apache.maven.project.path.DefaultPathTranslator;
+import org.apache.maven.project.path.PathTranslator;
import java.io.File;
import java.io.IOException;
@@ -317,6 +319,27 @@
assertEquals( new File( basedir, "artifact.jar" ).getAbsolutePath(), new File( ( (Dependency) rDeps.get( 0 ) )
.getSystemPath() ).getAbsolutePath() );
}
+
+ public void testTwoLevelRecursiveBasedirAlignedExpression()
+ throws Exception
+ {
+ Model model = new Model();
+ Build build = new Build();
+
+ model.setBuild( build );
+
+ build.setDirectory( "${project.basedir}/target" );
+ build.setOutputDirectory( "${project.build.directory}/classes" );
+
+ PathTranslator translator = new DefaultPathTranslator();
+ RegexBasedModelInterpolator interpolator = new RegexBasedModelInterpolator( translator );
+
+ File basedir = new File( System.getProperty( "java.io.tmpdir" ), "base" );
+
+ String value = interpolator.interpolate( "${project.build.outputDirectory}/foo", model, basedir, new DefaultProjectBuilderConfiguration(), true );
+
+ assertEquals( value, new File( basedir, "target/classes/foo" ).getAbsolutePath() );
+ }
// public void testPOMExpressionDoesNotUseSystemProperty()
// throws Exception
Modified: maven/components/branches/maven-2.0.10-RC/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/pom.xml?rev=677447&r1=677446&r2=677447&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/pom.xml (original)
+++ maven/components/branches/maven-2.0.10-RC/pom.xml Wed Jul 16 15:15:57 2008
@@ -369,7 +369,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>