You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/07/16 11:59:14 UTC
svn commit: r964730 - in /maven/maven-3/trunk: ./ maven-core/
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/settings/
maven-core/src/main/java/org/apache/maven/settings/building/
maven-core/src/main/java/org/apach...
Author: bentmann
Date: Fri Jul 16 09:59:13 2010
New Revision: 964730
URL: http://svn.apache.org/viewvc?rev=964730&view=rev
Log:
o Moved settings building into separate module
Added:
maven/maven-3/trunk/maven-settings-builder/ (with props)
maven/maven-3/trunk/maven-settings-builder/pom.xml (with props)
maven/maven-3/trunk/maven-settings-builder/src/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/java/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/
- copied from r964720, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/building/
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/
- copied from r964720, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/crypto/
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/io/
- copied from r964720, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/io/
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java (with props)
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/
- copied from r964720, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/
maven/maven-3/trunk/maven-settings-builder/src/test/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/test/java/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/ (with props)
maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/
- copied from r964720, maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/settings/validation/
Removed:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/building/
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/crypto/
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/io/
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/settings/validation/
Modified:
maven/maven-3/trunk/maven-core/pom.xml
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=964730&r1=964729&r2=964730&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/pom.xml Fri Jul 16 09:59:13 2010
@@ -35,6 +35,10 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
</dependency>
<dependency>
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=964730&r1=964729&r2=964730&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Fri Jul 16 09:59:13 2010
@@ -75,6 +75,7 @@ public class DefaultArtifactFilterManage
artifacts.add( "org.apache.maven:maven-project" );
artifacts.add( "org.apache.maven:maven-repository-metadata" );
artifacts.add( "org.apache.maven:maven-settings" );
+ artifacts.add( "org.apache.maven:maven-settings-builder" );
artifacts.add( "org.apache.maven:maven-toolchain" );
artifacts.add( "org.apache.maven.wagon:wagon-provider-api" );
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java?rev=964730&r1=964729&r2=964730&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java Fri Jul 16 09:59:13 2010
@@ -19,13 +19,10 @@ package org.apache.maven.settings;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.maven.model.ActivationFile;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.settings.merge.MavenSettingsMerger;
/**
* Several convenience methods to handle settings
@@ -34,6 +31,7 @@ import org.codehaus.plexus.util.StringUt
*/
public final class SettingsUtils
{
+
private SettingsUtils()
{
// don't allow construction.
@@ -46,101 +44,7 @@ public final class SettingsUtils
*/
public static void merge( Settings dominant, Settings recessive, String recessiveSourceLevel )
{
- if ( dominant == null || recessive == null )
- {
- return;
- }
-
- recessive.setSourceLevel( recessiveSourceLevel );
-
- List<String> dominantActiveProfiles = dominant.getActiveProfiles();
- List<String> recessiveActiveProfiles = recessive.getActiveProfiles();
-
- if ( recessiveActiveProfiles != null )
- {
- if ( dominantActiveProfiles == null )
- {
- dominantActiveProfiles = new ArrayList<String>();
- dominant.setActiveProfiles( dominantActiveProfiles );
- }
-
- for ( String profileId : recessiveActiveProfiles )
- {
- if ( !dominantActiveProfiles.contains( profileId ) )
- {
- dominantActiveProfiles.add( profileId );
- }
- }
- }
-
- List<String> dominantPluginGroupIds = dominant.getPluginGroups();
-
- List<String> recessivePluginGroupIds = recessive.getPluginGroups();
-
- if ( recessivePluginGroupIds != null )
- {
- if ( dominantPluginGroupIds == null )
- {
- dominantPluginGroupIds = new ArrayList<String>();
- dominant.setPluginGroups( dominantPluginGroupIds );
- }
-
- for ( String pluginGroupId : recessivePluginGroupIds )
- {
- if ( !dominantPluginGroupIds.contains( pluginGroupId ) )
- {
- dominantPluginGroupIds.add( pluginGroupId );
- }
- }
- }
-
- if ( StringUtils.isEmpty( dominant.getLocalRepository() ) )
- {
- dominant.setLocalRepository( recessive.getLocalRepository() );
- }
-
- shallowMergeById( dominant.getMirrors(), recessive.getMirrors(), recessiveSourceLevel );
- shallowMergeById( dominant.getServers(), recessive.getServers(), recessiveSourceLevel );
- shallowMergeById( dominant.getProxies(), recessive.getProxies(), recessiveSourceLevel );
- shallowMergeById( dominant.getProfiles(), recessive.getProfiles(), recessiveSourceLevel );
-
- }
-
- /**
- * @param dominant
- * @param recessive
- * @param recessiveSourceLevel
- */
- private static <T extends IdentifiableBase> void shallowMergeById( List<T> dominant, List<T> recessive,
- String recessiveSourceLevel )
- {
- Map<String, T> dominantById = mapById( dominant );
-
- for ( T identifiable : recessive )
- {
- if ( !dominantById.containsKey( identifiable.getId() ) )
- {
- identifiable.setSourceLevel( recessiveSourceLevel );
-
- dominant.add( identifiable );
- }
- }
- }
-
- /**
- * @param identifiables
- * @return a map
- */
- private static <T extends IdentifiableBase> Map<String, T> mapById( List<T> identifiables )
- {
- Map<String, T> byId = new HashMap<String, T>();
-
- for ( T identifiable : identifiables )
- {
- byId.put( identifiable.getId(), identifiable );
- }
-
- return byId;
+ new MavenSettingsMerger().merge( dominant, recessive, recessiveSourceLevel );
}
/**
Propchange: maven/maven-3/trunk/maven-settings-builder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 09:59:13 2010
@@ -0,0 +1,8 @@
+.settings
+target
+.classpath
+.project
+*.iml
+*.ipr
+*.iws
+bin
Added: maven/maven-3/trunk/maven-settings-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/pom.xml?rev=964730&view=auto
==============================================================================
--- maven/maven-3/trunk/maven-settings-builder/pom.xml (added)
+++ maven/maven-3/trunk/maven-settings-builder/pom.xml Fri Jul 16 09:59:13 2010
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-settings-builder</artifactId>
+
+ <name>Maven Settings Builder</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-sec-dispatcher</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/maven-3/trunk/maven-settings-builder/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-3/trunk/maven-settings-builder/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/maven-3/trunk/maven-settings-builder/src/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Modified: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java?rev=964730&r1=964720&r2=964730&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java (original)
+++ maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java Fri Jul 16 09:59:13 2010
@@ -28,11 +28,11 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.SettingsUtils;
import org.apache.maven.settings.TrackableBase;
import org.apache.maven.settings.io.SettingsParseException;
import org.apache.maven.settings.io.SettingsReader;
import org.apache.maven.settings.io.SettingsWriter;
+import org.apache.maven.settings.merge.MavenSettingsMerger;
import org.apache.maven.settings.validation.SettingsValidator;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -44,7 +44,7 @@ import org.codehaus.plexus.interpolation
/**
* Builds the effective settings from a user settings file and/or a global settings file.
- *
+ *
* @author Benjamin Bentmann
*/
@Component( role = SettingsBuilder.class )
@@ -61,6 +61,8 @@ public class DefaultSettingsBuilder
@Requirement
private SettingsValidator settingsValidator;
+ private MavenSettingsMerger settingsMerger = new MavenSettingsMerger();
+
public SettingsBuildingResult build( SettingsBuildingRequest request )
throws SettingsBuildingException
{
@@ -70,7 +72,7 @@ public class DefaultSettingsBuilder
Settings userSettings = readSettings( request.getUserSettingsFile(), request, problems );
- SettingsUtils.merge( userSettings, globalSettings, TrackableBase.GLOBAL_LEVEL );
+ settingsMerger.merge( userSettings, globalSettings, TrackableBase.GLOBAL_LEVEL );
problems.setSource( "" );
@@ -159,8 +161,7 @@ public class DefaultSettingsBuilder
return settings;
}
- private Settings interpolate( Settings settings, SettingsBuildingRequest request,
- SettingsProblemCollector problems )
+ private Settings interpolate( Settings settings, SettingsBuildingRequest request, SettingsProblemCollector problems )
{
StringWriter writer = new StringWriter( 1024 * 4 );
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java?rev=964730&view=auto
==============================================================================
--- maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java (added)
+++ maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java Fri Jul 16 09:59:13 2010
@@ -0,0 +1,142 @@
+package org.apache.maven.settings.merge;
+
+/*
+ * 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.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.settings.IdentifiableBase;
+import org.apache.maven.settings.Settings;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ * @author Benjamin Bentmann
+ */
+public class MavenSettingsMerger
+{
+
+ /**
+ * @param dominant
+ * @param recessive
+ * @param recessiveSourceLevel
+ */
+ public void merge( Settings dominant, Settings recessive, String recessiveSourceLevel )
+ {
+ if ( dominant == null || recessive == null )
+ {
+ return;
+ }
+
+ recessive.setSourceLevel( recessiveSourceLevel );
+
+ List<String> dominantActiveProfiles = dominant.getActiveProfiles();
+ List<String> recessiveActiveProfiles = recessive.getActiveProfiles();
+
+ if ( recessiveActiveProfiles != null )
+ {
+ if ( dominantActiveProfiles == null )
+ {
+ dominantActiveProfiles = new ArrayList<String>();
+ dominant.setActiveProfiles( dominantActiveProfiles );
+ }
+
+ for ( String profileId : recessiveActiveProfiles )
+ {
+ if ( !dominantActiveProfiles.contains( profileId ) )
+ {
+ dominantActiveProfiles.add( profileId );
+ }
+ }
+ }
+
+ List<String> dominantPluginGroupIds = dominant.getPluginGroups();
+
+ List<String> recessivePluginGroupIds = recessive.getPluginGroups();
+
+ if ( recessivePluginGroupIds != null )
+ {
+ if ( dominantPluginGroupIds == null )
+ {
+ dominantPluginGroupIds = new ArrayList<String>();
+ dominant.setPluginGroups( dominantPluginGroupIds );
+ }
+
+ for ( String pluginGroupId : recessivePluginGroupIds )
+ {
+ if ( !dominantPluginGroupIds.contains( pluginGroupId ) )
+ {
+ dominantPluginGroupIds.add( pluginGroupId );
+ }
+ }
+ }
+
+ if ( StringUtils.isEmpty( dominant.getLocalRepository() ) )
+ {
+ dominant.setLocalRepository( recessive.getLocalRepository() );
+ }
+
+ shallowMergeById( dominant.getMirrors(), recessive.getMirrors(), recessiveSourceLevel );
+ shallowMergeById( dominant.getServers(), recessive.getServers(), recessiveSourceLevel );
+ shallowMergeById( dominant.getProxies(), recessive.getProxies(), recessiveSourceLevel );
+ shallowMergeById( dominant.getProfiles(), recessive.getProfiles(), recessiveSourceLevel );
+
+ }
+
+ /**
+ * @param dominant
+ * @param recessive
+ * @param recessiveSourceLevel
+ */
+ private static <T extends IdentifiableBase> void shallowMergeById( List<T> dominant, List<T> recessive,
+ String recessiveSourceLevel )
+ {
+ Map<String, T> dominantById = mapById( dominant );
+
+ for ( T identifiable : recessive )
+ {
+ if ( !dominantById.containsKey( identifiable.getId() ) )
+ {
+ identifiable.setSourceLevel( recessiveSourceLevel );
+
+ dominant.add( identifiable );
+ }
+ }
+ }
+
+ /**
+ * @param identifiables
+ * @return a map
+ */
+ private static <T extends IdentifiableBase> Map<String, T> mapById( List<T> identifiables )
+ {
+ Map<String, T> byId = new HashMap<String, T>();
+
+ for ( T identifiable : identifiables )
+ {
+ byId.put( identifiable.getId(), identifiable );
+ }
+
+ return byId;
+ }
+
+}
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-3/trunk/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-settings-builder/src/test/java/org/apache/maven/settings/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=964730&r1=964729&r2=964730&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Fri Jul 16 09:59:13 2010
@@ -133,6 +133,7 @@
<module>apache-maven</module>
<module>maven-model</module>
<module>maven-settings</module>
+ <module>maven-settings-builder</module>
<module>maven-artifact</module>
<module>maven-repository-metadata</module>
<module>maven-plugin-api</module>
@@ -194,6 +195,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${project.version}</version>
</dependency>