svn commit: r705183 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

[si...@apache.org]

Author: sisbell
Date: Thu Oct 16 02:16:15 2008
New Revision: 705183

URL: http://svn.apache.org/viewvc?rev=705183&view=rev
Log:
Fix: IT0141

Modified:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.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=705183&r1=705182&r2=705183&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 Thu Oct 16 02:16:15 2008
@@ -573,17 +573,33 @@
         return false;
     }
 
-    private static void interpolateModelProperties(List<ModelProperty> modelProperties,
-                                                   List<InterpolatorProperty> interpolatorProperties,
-                                                   PomClassicDomainModel domainModel)
-           throws IOException
+    private static void putProjectAliasIn(Map<String, String> map, String s)
     {
+        map.put( "\\$\\{project." + s + "\\}", "\\$\\{" + s + "\\}");
+    }
+
+    private static Map<String, String> aliases = new HashMap<String, String>();
 
-        Map<String, String> aliases = new HashMap<String, String>();
+    static
+    {
         aliases.put( "project.", "pom.");
         aliases.put( "\\$\\{project.build.", "\\$\\{build.");
-        aliases.put( "\\$\\{project.parent.", "\\$\\{parent.");
 
+        List<String> aliasList = Arrays.asList("artifactId", "groupId", "version", "packaging", "name", "description",
+            "url", "inceptionYear", "scm.url", "ciManagement.url", "distributionManagement.repository.name",
+            "reporting.outputDirectory", "parent.groupId", "parent.artifactId",
+            "parent.version", "prerequisites.maven", "issueManagement.url", "organization.name");
+        for(String alias : aliasList) {
+            putProjectAliasIn(aliases, alias);
+        }
+
+    }
+
+    private static void interpolateModelProperties(List<ModelProperty> modelProperties,
+                                                   List<InterpolatorProperty> interpolatorProperties,
+                                                   PomClassicDomainModel domainModel)
+           throws IOException
+    {
         if(!containsProjectVersion(interpolatorProperties))
         {
             aliases.put("\\$\\{project.version\\}", "\\$\\{version\\}");