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

[jvanzyl]

Author: jvanzyl
Date: Sat Dec 13 21:04:54 2008
New Revision: 726361

URL: http://svn.apache.org/viewvc?rev=726361&view=rev
Log:
o merge back in the transform plugin management

Modified:
    
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java

Modified: 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=726361&r1=726360&r2=726361&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
 (original)
+++ 
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
 Sat Dec 13 21:04:54 2008
@@ -145,8 +145,17 @@
         {
             for ( ModelContainer managementContainer : source.queryFor( 
ProjectUri.Build.PluginManagement.Plugins.Plugin.xUri ) )
             {
-                managementContainer = new 
ArtifactModelContainerFactory().create(
-                    transformPluginManagement( 
managementContainer.getProperties() ) );
+                List<ModelProperty> transformedProperties = new 
ArrayList<ModelProperty>();
+                for ( ModelProperty mp : managementContainer.getProperties() )
+                {
+                    if ( mp.getUri().startsWith( 
ProjectUri.DependencyManagement.xUri ) )
+                    {
+                        transformedProperties.add( new ModelProperty(
+                            mp.getUri().replace( 
ProjectUri.DependencyManagement.xUri, ProjectUri.xUri ), mp.getResolvedValue() 
) );
+                    }
+                }
+                
+                managementContainer = new 
ArtifactModelContainerFactory().create( transformedProperties );
 
                 //Remove duplicate executions tags
 
@@ -296,6 +305,20 @@
         return factory.createDomainModel( props );
     }
 
+    private static List<ModelProperty> transformDependencyManagement( 
List<ModelProperty> modelProperties )
+    {
+        List<ModelProperty> transformedProperties = new 
ArrayList<ModelProperty>();
+        for ( ModelProperty mp : modelProperties )
+        {
+            if ( mp.getUri().startsWith( ProjectUri.DependencyManagement.xUri 
) )
+            {
+                transformedProperties.add( new ModelProperty(
+                    mp.getUri().replace( ProjectUri.DependencyManagement.xUri, 
ProjectUri.xUri ), mp.getResolvedValue() ) );
+            }
+        }
+        return transformedProperties;
+    }
+    
     /**
      * @see ModelTransformer#transformToModelProperties(java.util.List)
      */
@@ -751,35 +774,6 @@
         return null;
     }
 
-    private static List<ModelProperty> transformDependencyManagement( 
List<ModelProperty> modelProperties )
-    {
-        List<ModelProperty> transformedProperties = new 
ArrayList<ModelProperty>();
-        for ( ModelProperty mp : modelProperties )
-        {
-            if ( mp.getUri().startsWith( ProjectUri.DependencyManagement.xUri 
) )
-            {
-                transformedProperties.add( new ModelProperty(
-                    mp.getUri().replace( ProjectUri.DependencyManagement.xUri, 
ProjectUri.xUri ), mp.getResolvedValue() ) );
-            }
-        }
-        return transformedProperties;
-    }
-
-    private static List<ModelProperty> transformPluginManagement( 
List<ModelProperty> modelProperties )
-    {
-        List<ModelProperty> transformedProperties = new 
ArrayList<ModelProperty>();
-        for ( ModelProperty mp : modelProperties )
-        {
-            if ( mp.getUri().startsWith( 
ProjectUri.Build.PluginManagement.xUri ) )
-            {
-                transformedProperties.add( new ModelProperty(
-                    mp.getUri().replace( 
ProjectUri.Build.PluginManagement.xUri, ProjectUri.Build.xUri ),
-                    mp.getResolvedValue() ) );
-            }
-        }
-        return transformedProperties;
-    }
-
     private static List<ModelProperty> transformPlugin( List<ModelProperty> 
modelProperties )
     {
         List<ModelProperty> transformedProperties = new 
ArrayList<ModelProperty>();