maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r726358 - /maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
Date Sun, 14 Dec 2008 04:34:36 GMT
Author: jvanzyl
Date: Sat Dec 13 20:34:36 2008
New Revision: 726358

URL: http://svn.apache.org/viewvc?rev=726358&view=rev
Log:
o fix typo, it's pluginContainer not dependencyContainer

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=726358&r1=726357&r2=726358&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 20:34:36 2008
@@ -141,10 +141,9 @@
             }
         }
 
-        for ( ModelContainer dependencyContainer : source.queryFor( ProjectUri.Build.Plugins.Plugin.xUri
) )
+        for ( ModelContainer pluginContainer : source.queryFor( ProjectUri.Build.Plugins.Plugin.xUri
) )
         {
-            for ( ModelContainer managementContainer : source.queryFor(
-                ProjectUri.Build.PluginManagement.Plugins.Plugin.xUri ) )
+            for ( ModelContainer managementContainer : source.queryFor( ProjectUri.Build.PluginManagement.Plugins.Plugin.xUri
) )
             {
                 managementContainer = new ArtifactModelContainerFactory().create(
                     transformPluginManagement( managementContainer.getProperties() ) );
@@ -152,7 +151,7 @@
                 //Remove duplicate executions tags
 
                 boolean hasExecutionsTag = false;
-                for ( ModelProperty mp : dependencyContainer.getProperties() )
+                for ( ModelProperty mp : pluginContainer.getProperties() )
                 {
                     if ( mp.getUri().equals( ProjectUri.Build.Plugins.Plugin.Executions.xUri
) )
                     {
@@ -160,6 +159,7 @@
                         break;
                     }
                 }
+                
                 List<ModelProperty> pList = new ArrayList<ModelProperty>();
                 if ( !hasExecutionsTag )
                 {
@@ -175,14 +175,15 @@
                         }
                     }
                 }
+                
                 managementContainer = new ArtifactModelContainerFactory().create( pList );
 
-                ModelContainerAction action = dependencyContainer.containerAction( managementContainer
);
+                ModelContainerAction action = pluginContainer.containerAction( managementContainer
);
 
                 if ( action.equals( ModelContainerAction.JOIN ) || action.equals( ModelContainerAction.DELETE
) )
                 {
                     ModelDataSource dependencyDatasource = new DefaultModelDataSource();
-                    dependencyDatasource.init( dependencyContainer.getProperties(), Arrays.asList(
new ArtifactModelContainerFactory(),
+                    dependencyDatasource.init( pluginContainer.getProperties(), Arrays.asList(
new ArtifactModelContainerFactory(),
                             new IdModelContainerFactory() ) );
 
                     ModelDataSource managementDatasource = new DefaultModelDataSource();
@@ -196,7 +197,7 @@
                         managementPropertiesWithoutExecutions.removeAll(a.getProperties());
                     }
 
-                    source.join( dependencyContainer, new ArtifactModelContainerFactory().create(managementPropertiesWithoutExecutions)
);
+                    source.join( pluginContainer, new ArtifactModelContainerFactory().create(managementPropertiesWithoutExecutions)
);
 
                     List<ModelContainer> dependencyExecutionContainers = dependencyDatasource.queryFor(ProjectUri.Build.Plugins.Plugin.Executions.Execution.xUri);
                     List<ModelContainer> joinedExecutionContainers = new ArrayList<ModelContainer>();
@@ -214,7 +215,7 @@
                     }
 
                     ModelProperty executionsProperty = null;
-                    for(ModelProperty a : dependencyContainer.getProperties())
+                    for(ModelProperty a : pluginContainer.getProperties())
                     {
                         if(a.getUri().equals(ProjectUri.Build.Plugins.Plugin.Executions.xUri))
{
                             executionsProperty = a;



Mime
View raw message