o profiles are now decoupled from settings. so that i don't do this is one huge commit i need to move settings stuff into the core

while i transform the settings components to take a MavenSession. Any component executing within Maven should be able to use
  a session. the session will contain everything required and any new component added to the system should only take the 
  session as a parameter. same pattern for all components. that's the goal. it will take a few hops.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573462 13f79535-47bb-0310-9956-ffa450edef68

maven-core/pom.xml

@@ -40,11 +40,6 @@ under the License.
       <artifactId>maven-build-context</artifactId>
       <version>2.1-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>2.1-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
@@ -138,12 +133,26 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <configuration>
+          <version>1.0.0</version>
+          <model>src/main/mdo/settings.mdo</model>
+        </configuration>
+        <executions>
+          <execution>
+            <id>jdom</id>
+            <goals>
+              <goal>jdom-writer</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        
         <configuration>
           <excludes>
             <exclude>**/testutils/**</exclude>

maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java

@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.settings;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-core/src/main/resources/META-INF/plexus/components.xml

@@ -110,8 +110,8 @@ under the License.
           <role-hint>default</role-hint>
         </requirement>
         <requirement>
-	      <role>org.apache.maven.artifact.manager.WagonManager</role>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
-    	  <role-hint>default</role-hint>
+          <role-hint>default</role-hint>
         </requirement>
       </requirements>
     </component>
@@ -715,5 +715,21 @@ under the License.
       </requirements>
     </component>
 
+    <component>
+      <role>org.apache.maven.settings.validation.SettingsValidator</role>
+      <implementation>org.apache.maven.settings.validation.DefaultSettingsValidator</implementation>
+    </component>
+    <component>
+      <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+      <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.settings.validation.SettingsValidator</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.context.BuildContextManager</role>
+        </requirement>
+      </requirements>
+    </component>
   </components>
 </component-set>

maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

@@ -20,7 +20,7 @@ package org.apache.maven.embedder;
  */
 
 import org.apache.maven.Maven;
-import org.apache.maven.SettingsConfigurationException;
+import org.apache.maven.settings.SettingsConfigurationException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.handler.ArtifactHandler;

maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java

@@ -20,7 +20,7 @@ package org.apache.maven.embedder.execution;
  */
 
 import org.apache.maven.Maven;
-import org.apache.maven.SettingsConfigurationException;
+import org.apache.maven.settings.SettingsConfigurationException;
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;

maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java

@@ -20,9 +20,8 @@ package org.apache.maven.embedder;
  */
 
 import junit.framework.TestCase;
-import org.apache.maven.SettingsConfigurationException;
+import org.apache.maven.settings.SettingsConfigurationException;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionResult;

maven-project/pom.xml

@@ -42,11 +42,6 @@ under the License.
       <artifactId>maven-profile</artifactId>
       <version>2.1-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>2.1-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>

maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java

@@ -21,7 +21,6 @@ package org.apache.maven.profiles.manager;
 
 import org.apache.maven.model.Profile;
 import org.apache.maven.profiles.activation.ProfileActivationException;
-import org.apache.maven.settings.Settings;
 
 import java.util.List;
 import java.util.Map;

maven-settings/pom.xml

@@ -1,77 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.1-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-settings</artifactId>
-  <name>Maven Local Settings Model</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.0.0</version>
-          <model>src/main/mdo/settings.mdo</model>
-        </configuration>
-        <executions>
-          <execution>
-            <id>jdom</id>
-            <goals>
-              <goal>jdom-writer</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-build-context</artifactId>
-      <version>2.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <!-- Generated model code -->
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jdom</groupId>
-      <artifactId>jdom</artifactId>
-    </dependency>
-  </dependencies>
-</project>

maven-settings/src/main/resources/META-INF/plexus/components.xml

@@ -1,39 +0,0 @@
-<!--
-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.
--->
-
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.settings.validation.SettingsValidator</role>
-      <implementation>org.apache.maven.settings.validation.DefaultSettingsValidator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.settings.MavenSettingsBuilder</role>
-      <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.settings.validation.SettingsValidator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.context.BuildContextManager</role>
-        </requirement>
-      </requirements>
-    </component>
-  </components>
-</component-set>

pom.xml

@@ -118,7 +118,6 @@ under the License.
     <module>maven-profile</module>
     <module>maven-project</module>
     <module>maven-reporting-api</module>
-    <module>maven-settings</module>
     <module>maven-embedder</module>
   </modules>
   <properties>