svn commit: r694999 - in /maven/components/trunk: maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java

[sisbell]

Author: sisbell
Date: Sat Sep 13 11:21:29 2008
New Revision: 694999

URL: http://svn.apache.org/viewvc?rev=694999&view=rev
Log:
Some ITs were failing because of the new interpolation code. Certains code 
paths were failing because they did not add CDATA sections to the pom. Added 
CDATA support directly to ModelProperty so path doesn't matter.

Modified:
    
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/ModelProperty.java

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=694999&r1=694998&r2=694999&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 11:21:29 2008
@@ -132,18 +132,7 @@
             throw new IllegalArgumentException( "properties: null" );
         }
 
-        List<ModelProperty> props = new ArrayList<ModelProperty>();
-        for ( ModelProperty mp : properties )
-        { //TODO: Resolved values
-            if ( mp.getResolvedValue() != null && ( 
mp.getResolvedValue().contains( "=" ) || mp.getResolvedValue().contains( "<" ) 
) )
-            {
-                props.add( new ModelProperty( mp.getUri(), "<![CDATA[" + 
mp.getResolvedValue() + "]]>" ) );
-            }
-            else
-            {
-                props.add( mp );
-            }
-        }
+        List<ModelProperty> props = new ArrayList<ModelProperty>( properties );
 
         //dependency management
         ModelDataSource source = new DefaultModelDataSource();
@@ -496,6 +485,7 @@
         }
 
         interpolateModelProperties( modelProperties, interpolatorProperties, 
((PomClassicDomainModel) domainModels.get(0)) );
+        
         return modelProperties;
     }
 

Modified: 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java?rev=694999&r1=694998&r2=694999&view=diff
==============================================================================
--- 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java
 (original)
+++ 
maven/components/trunk/maven-shared-model/src/main/java/org/apache/maven/shared/model/ModelProperty.java
 Sat Sep 13 11:21:29 2008
@@ -124,12 +124,17 @@
     }
 
     /**
-     * Value of this model property after interpolation.
+     * Value of this model property after interpolation. CDATA section will be 
added if needed.
      *
      * @return value of this model property after interpolation
      */
     public String getResolvedValue()
     {
+        if( resolvedValue != null && !resolvedValue.startsWith ("<![CDATA[")
+                && (resolvedValue.contains( "=" ) || resolvedValue.contains( 
"<" )))
+        {
+            resolvedValue =  "<![CDATA[" + resolvedValue + "]]>";
+        }
         return resolvedValue;
     }