Author: bentmann
Date: Sun May 10 10:46:05 2009
New Revision: 773323
URL: http://svn.apache.org/viewvc?rev=773323&view=rev
Log:
o Moved injection of plugin/dependency management into isolated component and
decoupled from processors. The new component resembles the
ModelDefaultsInjector from 2.x but explicitly focuses on management
information. Other defaults like the lifecycle induced plugins should be
handled by another component.
Added:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/
(with props)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java
(with props)
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java
(with props)
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?rev=773323&r1=773322&r2=773323&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
Sun May 10 10:46:05 2009
@@ -28,6 +28,8 @@
import org.apache.maven.model.inheritance.DefaultInheritanceAssembler;
import org.apache.maven.model.inheritance.InheritanceAssembler;
+import org.apache.maven.model.management.DefaultManagementInjector;
+import org.apache.maven.model.management.ManagementInjector;
import org.apache.maven.model.processors.BuildProcessor;
import org.apache.maven.model.processors.CiManagementProcessor;
import org.apache.maven.model.processors.ContributorsProcessor;
@@ -288,6 +290,8 @@
p1.setArtifactId(id);
build.addPlugin(p1);
}
+
+ private static ManagementInjector managementInjector = new
DefaultManagementInjector();
public static Model processManagementNodes(Model target)
throws IOException
@@ -296,6 +300,12 @@
// plugin.setArtifactId("maven-compiler-plugin");
// target.getBuild().addPlugin(plugin);
// Dependency Management
+ managementInjector.injectManagement( target );
+ if ( true )
+ {
+ return target;
+ }
+
DependencyManagementProcessor depProc = new
DependencyManagementProcessor();
if ( target.getDependencyManagement() != null )
{
Propchange:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java?rev=773323&view=auto
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java
(added)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java
Sun May 10 10:46:05 2009
@@ -0,0 +1,192 @@
+package org.apache.maven.model.management;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginContainer;
+import org.apache.maven.model.PluginExecution;
+import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.merge.MavenModelMerger;
+import org.codehaus.plexus.component.annotations.Component;
+
+/**
+ * Handles injection of plugin/dependency management into the model.
+ *
+ * @author Benjamin Bentmann
+ */
+...@component( role = ManagementInjector.class )
+public class DefaultManagementInjector
+ implements ManagementInjector
+{
+
+ private ManagementModelMerger merger = new ManagementModelMerger();
+
+ public void injectManagement( Model model )
+ {
+ merger.mergeManagedDependencies( model );
+ merger.mergeManagedBuildPlugins( model );
+ }
+
+ private static class ManagementModelMerger
+ extends MavenModelMerger
+ {
+
+ public void mergeManagedBuildPlugins( Model model )
+ {
+ Build build = model.getBuild();
+ if ( build != null )
+ {
+ PluginManagement pluginManagement =
build.getPluginManagement();
+ if ( pluginManagement != null )
+ {
+ mergePluginContainer_Plugins( build, pluginManagement,
false, Collections.emptyMap() );
+ }
+ }
+ }
+
+ @Override
+ protected void mergePluginContainer_Plugins( PluginContainer target,
PluginContainer source,
+ boolean sourceDominant,
Map<Object, Object> context )
+ {
+ List<Plugin> src = source.getPlugins();
+ if ( !src.isEmpty() )
+ {
+ List<Plugin> tgt = target.getPlugins();
+
+ Map<Object, Plugin> managedPlugins = new LinkedHashMap<Object,
Plugin>( src.size() * 2 );
+
+ for ( Iterator<Plugin> it = src.iterator(); it.hasNext(); )
+ {
+ Plugin element = it.next();
+ Object key = getPluginKey( element );
+ managedPlugins.put( key, element );
+ }
+
+ for ( Iterator<Plugin> it = tgt.iterator(); it.hasNext(); )
+ {
+ Plugin element = it.next();
+ Object key = getPluginKey( element );
+ Plugin managedPlugin = managedPlugins.get( key );
+ if ( managedPlugin != null )
+ {
+ mergePlugin( element, managedPlugin, sourceDominant,
context );
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void mergePlugin_Executions( Plugin target, Plugin source,
boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ List<PluginExecution> src = source.getExecutions();
+ if ( !src.isEmpty() )
+ {
+ List<PluginExecution> tgt = target.getExecutions();
+
+ Map<Object, PluginExecution> merged =
+ new LinkedHashMap<Object, PluginExecution>( ( src.size() +
tgt.size() ) * 2 );
+
+ for ( Iterator<PluginExecution> it = src.iterator();
it.hasNext(); )
+ {
+ PluginExecution element = it.next();
+ Object key = getPluginExecutionKey( element );
+ PluginExecution clone = new PluginExecution();
+ mergePluginExecution( clone, element, true, context );
+ merged.put( key, clone );
+ }
+
+ for ( Iterator<PluginExecution> it = tgt.iterator();
it.hasNext(); )
+ {
+ PluginExecution element = it.next();
+ Object key = getPluginExecutionKey( element );
+ PluginExecution existing = merged.get( key );
+ if ( existing != null )
+ {
+ mergePluginExecution( element, existing,
sourceDominant, context );
+ }
+ merged.put( key, element );
+ }
+
+ target.setExecutions( new ArrayList<PluginExecution>(
merged.values() ) );
+ }
+ }
+
+ public void mergeManagedDependencies( Model model )
+ {
+ DependencyManagement dependencyManagement =
model.getDependencyManagement();
+ if ( dependencyManagement != null )
+ {
+ Map<Object, Dependency> dependencies = new HashMap<Object,
Dependency>();
+ Map<Object, Object> context = Collections.emptyMap();
+
+ for ( Dependency dependency : model.getDependencies() )
+ {
+ Object key = getDependencyKey( dependency );
+ dependencies.put( key, dependency );
+ }
+
+ for ( Dependency managedDependency :
dependencyManagement.getDependencies() )
+ {
+ Object key = getDependencyKey( managedDependency );
+ Dependency dependency = dependencies.get( key );
+ if ( dependency != null )
+ {
+ mergeDependency( dependency, managedDependency, false,
context );
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void mergeDependency_Exclusions( Dependency target,
Dependency source, boolean sourceDominant,
+ Map<Object, Object> context
)
+ {
+ List<Exclusion> tgt = target.getExclusions();
+ if ( tgt.isEmpty() )
+ {
+ List<Exclusion> src = source.getExclusions();
+
+ for ( Iterator<Exclusion> it = src.iterator(); it.hasNext(); )
+ {
+ Exclusion element = it.next();
+ Exclusion clone = new Exclusion();
+ mergeExclusion( clone, element, true, context );
+ target.addExclusion( clone );
+ }
+ }
+ }
+
+ }
+
+}
Propchange:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultManagementInjector.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java?rev=773323&view=auto
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java
(added)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java
Sun May 10 10:46:05 2009
@@ -0,0 +1,40 @@
+package org.apache.maven.model.management;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.model.Model;
+
+/**
+ * Handles injection of plugin/dependency management into the model.
+ *
+ * @author Benjamin Bentmann
+ */
+public interface ManagementInjector
+{
+
+ /**
+ * Merges default values from the plugin and/or dependency management
sections of the given model into itself.
+ *
+ * @param child The model into which to merge the values specified by its
management sections, must not be
+ * <code>null</code>.
+ */
+ void injectManagement( Model child );
+
+}
Propchange:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/management/ManagementInjector.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java?rev=773323&r1=773322&r2=773323&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
(original)
+++
maven/components/branches/MNG-2766/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
Sun May 10 10:46:05 2009
@@ -38,6 +38,7 @@
import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.model.Developer;
import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Extension;
import org.apache.maven.model.FileSet;
import org.apache.maven.model.IssueManagement;
@@ -1031,6 +1032,183 @@
protected void mergeDependency( Dependency target, Dependency source,
boolean sourceDominant,
Map<Object, Object> context )
{
+ mergeDependency_GroupId( target, source, sourceDominant, context );
+ mergeDependency_ArtifactId( target, source, sourceDominant, context );
+ mergeDependency_Version( target, source, sourceDominant, context );
+ mergeDependency_Type( target, source, sourceDominant, context );
+ mergeDependency_Classifier( target, source, sourceDominant, context );
+ mergeDependency_Scope( target, source, sourceDominant, context );
+ mergeDependency_SystemPath( target, source, sourceDominant, context );
+ mergeDependency_Optional( target, source, sourceDominant, context );
+ mergeDependency_Exclusions( target, source, sourceDominant, context );
+ }
+
+ protected void mergeDependency_GroupId( Dependency target, Dependency
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getGroupId();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getGroupId() == null )
+ {
+ target.setGroupId( src );
+ }
+ }
+ }
+
+ protected void mergeDependency_ArtifactId( Dependency target, Dependency
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getArtifactId();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getArtifactId() == null )
+ {
+ target.setArtifactId( src );
+ }
+ }
+ }
+
+ protected void mergeDependency_Version( Dependency target, Dependency
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getVersion();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getVersion() == null )
+ {
+ target.setVersion( src );
+ }
+ }
+ }
+
+ protected void mergeDependency_Type( Dependency target, Dependency source,
boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getType();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getType() == null )
+ {
+ target.setType( src );
+ }
+ }
+ }
+
+ protected void mergeDependency_Classifier( Dependency target, Dependency
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getClassifier();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getClassifier() == null )
+ {
+ target.setClassifier( src );
+ }
+ }
+ }
+
+ protected void mergeDependency_Scope( Dependency target, Dependency
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getScope();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getScope() == null )
+ {
+ target.setScope( src );
+ }
+ }
+ }
+
+ protected void mergeDependency_SystemPath( Dependency target, Dependency
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getSystemPath();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getSystemPath() == null )
+ {
+ target.setSystemPath( src );
+ }
+ }
+ }
+
+ protected void mergeDependency_Optional( Dependency target, Dependency
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getOptional();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getOptional() == null )
+ {
+ target.setOptional( src );
+ }
+ }
+ }
+
+ protected void mergeDependency_Exclusions( Dependency target, Dependency
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ List<Exclusion> src = source.getExclusions();
+ if ( !src.isEmpty() )
+ {
+ List<Exclusion> tgt = target.getExclusions();
+
+ Map<Object, Exclusion> merged = new LinkedHashMap<Object,
Exclusion>( ( src.size() + tgt.size() ) * 2 );
+
+ for ( Iterator<Exclusion> it = tgt.iterator(); it.hasNext(); )
+ {
+ Exclusion element = it.next();
+ Object key = getExclusionKey( element );
+ merged.put( key, element );
+ }
+
+ for ( Iterator<Exclusion> it = src.iterator(); it.hasNext(); )
+ {
+ Exclusion element = it.next();
+ Object key = getExclusionKey( element );
+ if ( sourceDominant || !merged.containsKey( key ) )
+ {
+ merged.put( key, element );
+ }
+ }
+
+ target.setExclusions( new ArrayList<Exclusion>( merged.values() )
);
+ }
+ }
+
+ protected void mergeExclusion( Exclusion target, Exclusion source, boolean
sourceDominant,
+ Map<Object, Object> context )
+ {
+ mergeExclusion_GroupId( target, source, sourceDominant, context );
+ mergeExclusion_ArtifactId( target, source, sourceDominant, context );
+ }
+
+ protected void mergeExclusion_GroupId( Exclusion target, Exclusion source,
boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getGroupId();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getGroupId() == null )
+ {
+ target.setGroupId( src );
+ }
+ }
+ }
+
+ protected void mergeExclusion_ArtifactId( Exclusion target, Exclusion
source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ String src = source.getArtifactId();
+ if ( src != null )
+ {
+ if ( sourceDominant || target.getArtifactId() == null )
+ {
+ target.setArtifactId( src );
+ }
+ }
}
protected void mergeReporting( Reporting target, Reporting source, boolean
sourceDominant,
@@ -2295,6 +2473,7 @@
if ( !src.isEmpty() )
{
List<PluginExecution> tgt = target.getExecutions();
+
Map<Object, PluginExecution> merged =
new LinkedHashMap<Object, PluginExecution>( ( src.size() +
tgt.size() ) * 2 );
@@ -2596,4 +2775,9 @@
return object;
}
+ protected Object getExclusionKey( Exclusion object )
+ {
+ return object.getGroupId() + ':' + object.getArtifactId();
+ }
+
}
