svn commit: r688214 - /maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java

[jdcasey]

Author: jdcasey
Date: Fri Aug 22 15:56:13 2008
New Revision: 688214

URL: http://svn.apache.org/viewvc?rev=688214&view=rev
Log:
Re-adding backward-compat support for envar access via ${ENVAR} in addition to 
${env.ENVAR}.

Modified:
    
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java

Modified: 
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.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/AbstractStringBasedModelInterpolator.java?rev=688214&r1=688213&r2=688214&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
 (original)
+++ 
maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
 Fri Aug 22 15:56:13 2008
@@ -241,12 +241,19 @@
         },
         PROJECT_PREFIXES, true );
         
-        List valueSources = new ArrayList( 7 );
+        List valueSources = new ArrayList( 8 );
         
         // NOTE: Order counts here!
         valueSources.add( basedirValueSource );
         valueSources.add( new BuildTimestampValueSource( 
config.getBuildStartTime(), timestampFormat ) );
         valueSources.add( new MapBasedValueSource( 
config.getExecutionProperties() ) );
+        valueSources.add( new AbstractValueSource( false )
+        {
+            public Object getValue( String expression )
+            {
+                return config.getExecutionProperties().getProperty( "env." + 
expression );
+            }
+        } );
         valueSources.add( modelValueSource1 );
         valueSources.add( new PrefixedValueSourceWrapper( new 
MapBasedValueSource( modelProperties ), PROJECT_PREFIXES, true ) );
         valueSources.add( modelValueSource2 );