Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o fix typo, it's pluginContainer not dependencyContainer 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726358 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2008-12-14 04:34:36 +00:00
parent abd5d033d6
commit 24cfa6f927
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
View File

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