svn commit: r695022 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/extension/ maven-project/src/main/java/org/apache/maven/project/builder/ maven-shared-model/src/main/java/org/apache/maven/shared/model/

[sisbell]

Author: sisbell
Date: Sat Sep 13 13:20:25 2008
New Revision: 695022

URL: http://svn.apache.org/viewvc?rev=695022&view=rev
Log:
Fix: IT0098 - CLI properties now correctly constructed and passed to 
interpolator.

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
    
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/InterpolatorProperty.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?rev=695022&r1=695021&r2=695022&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
 Sat Sep 13 13:20:25 2008
@@ -167,13 +167,6 @@
                 interpolatorProperties.addAll( 
InterpolatorProperty.toInterpolatorProperties( config.getUserProperties()));
                 model = PomClassicTransformer.interpolateModel( model, 
interpolatorProperties, modelPom.getParentFile());
 
-                /*
-                try {
-                    model = modelInterpolator.interpolate( model, 
modelPom.getParentFile(), config, getLogger().isDebugEnabled() );
-                } catch (ModelInterpolationException e) {
-                    e.printStackTrace();  //To change body of catch statement 
use File | Settings | File Templates.
-                }
-                */
                 grabManagedPluginsWithExtensionsFlagTurnedOn( model, 
managedPluginsWithExtensionsFlag );
 
                 Properties modelProps = model.getProperties();

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=695022&r1=695021&r2=695022&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
 Sat Sep 13 13:20:25 2008
@@ -539,7 +539,22 @@
     private static void interpolateModelProperties(List<ModelProperty> 
modelProperties,
                                                    List<InterpolatorProperty> 
interpolatorProperties,
                                                    PomClassicDomainModel 
domainModel)
+           throws IOException
     {
+        //RULE: No Self-Referential Properties
+        /*
+        for(ModelProperty mp : modelProperties)
+        {
+            if(mp.getUri().startsWith( ProjectUri.properties ) && 
mp.getValue() != null)
+            {
+                String name = mp.getUri().substring( mp.getUri().lastIndexOf( 
"/" ) + 1, mp.getUri().length() );
+                if( mp.getValue().equals( "${" + name + "}") )
+                {
+                    throw new IOException( "Self-Referential reference in pom: 
Name = " + name );
+                }
+            }
+        }
+        */
         Map<String, String> aliases = new HashMap<String, String>();
         aliases.put( "project.", "pom.");
 

Modified: 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/InterpolatorProperty.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/InterpolatorProperty.java?rev=695022&r1=695021&r2=695022&view=diff
==============================================================================
--- 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/InterpolatorProperty.java
 (original)
+++ 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/InterpolatorProperty.java
 Sat Sep 13 13:20:25 2008
@@ -131,7 +131,7 @@
         List<InterpolatorProperty> interpolatorProperties = new 
ArrayList<InterpolatorProperty>();
         for ( Map.Entry<Object, Object> e : properties.entrySet() )
         {
-            interpolatorProperties.add( new InterpolatorProperty( (String) 
e.getKey(), (String) e.getValue()) );
+            interpolatorProperties.add( new InterpolatorProperty( "${" + 
e.getKey() +"}", (String) e.getValue()) );
         }
         return interpolatorProperties;
     }