From 9c8903441f5f082a1e0f98366a56afb5570f496b Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Fri, 7 Sep 2007 05:25:49 +0000 Subject: [PATCH] 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 | 25 ++++-- .../settings/DefaultMavenSettingsBuilder.java | 0 .../maven/settings/MavenSettingsBuilder.java | 0 .../apache/maven/settings/RuntimeInfo.java | 0 .../SettingsConfigurationException.java | 2 +- .../apache/maven/settings/SettingsUtils.java | 0 .../validation/DefaultSettingsValidator.java | 0 .../validation/SettingsValidationResult.java | 0 .../validation/SettingsValidator.java | 0 .../src/main/mdo/settings.mdo | 0 .../resources/META-INF/plexus/components.xml | 38 ++++++--- .../maven/settings/SettingsUtilsTest.java | 0 .../DefaultSettingsValidatorTest.java | 0 .../apache/maven/embedder/MavenEmbedder.java | 2 +- ...DefaultMavenExecutionRequestPopulator.java | 2 +- .../maven/embedder/MavenEmbedderTest.java | 3 +- maven-project/pom.xml | 5 -- .../profiles/manager/ProfileManager.java | 1 - maven-settings/pom.xml | 77 ------------------- .../resources/META-INF/plexus/components.xml | 39 ---------- pom.xml | 1 - 21 files changed, 48 insertions(+), 147 deletions(-) rename {maven-settings => maven-core}/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (100%) rename {maven-settings => maven-core}/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java (100%) rename {maven-settings => maven-core}/src/main/java/org/apache/maven/settings/RuntimeInfo.java (100%) rename {maven-settings/src/main/java/org/apache/maven => maven-core/src/main/java/org/apache/maven/settings}/SettingsConfigurationException.java (98%) rename {maven-settings => maven-core}/src/main/java/org/apache/maven/settings/SettingsUtils.java (100%) rename {maven-settings => maven-core}/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java (100%) rename {maven-settings => maven-core}/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java (100%) rename {maven-settings => maven-core}/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java (100%) rename {maven-settings => maven-core}/src/main/mdo/settings.mdo (100%) rename {maven-settings => maven-core}/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java (100%) rename {maven-settings => maven-core}/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java (100%) delete mode 100644 maven-settings/pom.xml delete mode 100644 maven-settings/src/main/resources/META-INF/plexus/components.xml diff --git a/maven-core/pom.xml b/maven-core/pom.xml index e378d4f337..2656d87591 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -40,11 +40,6 @@ under the License. maven-build-context 2.1-SNAPSHOT - - org.apache.maven - maven-settings - 2.1-SNAPSHOT - org.apache.maven.reporting maven-reporting-api @@ -136,14 +131,28 @@ under the License. easymock 1.2_Java1.3 test - + - + + org.codehaus.modello + modello-maven-plugin + + 1.0.0 + src/main/mdo/settings.mdo + + + + jdom + + jdom-writer + + + + maven-surefire-plugin - **/testutils/** diff --git a/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java rename to maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java diff --git a/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java rename to maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java diff --git a/maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java b/maven-core/src/main/java/org/apache/maven/settings/RuntimeInfo.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/RuntimeInfo.java rename to maven-core/src/main/java/org/apache/maven/settings/RuntimeInfo.java diff --git a/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java similarity index 98% rename from maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java rename to maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java index 82af5a4797..6bc19b73a1 100644 --- a/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java +++ b/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 diff --git a/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java rename to maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java diff --git a/maven-settings/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java b/maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java rename to maven-core/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java diff --git a/maven-settings/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java b/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java rename to maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java diff --git a/maven-settings/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java b/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java rename to maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-core/src/main/mdo/settings.mdo similarity index 100% rename from maven-settings/src/main/mdo/settings.mdo rename to maven-core/src/main/mdo/settings.mdo diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml index 40492030b0..e46ac274ac 100644 --- a/maven-core/src/main/resources/META-INF/plexus/components.xml +++ b/maven-core/src/main/resources/META-INF/plexus/components.xml @@ -43,7 +43,7 @@ under the License. - + org.apache.maven.ArtifactFilterManager org.apache.maven.DefaultArtifactFilterManager @@ -110,8 +110,8 @@ under the License. default - org.apache.maven.artifact.manager.WagonManager - default + org.apache.maven.artifact.manager.WagonManager + default @@ -538,7 +538,7 @@ under the License. - + org.codehaus.plexus.collections.ActiveMap lifecycle-loaders-by-packaging @@ -547,7 +547,7 @@ under the License. org.apache.maven.lifecycle.LifecycleBindingLoader - + org.codehaus.plexus.collections.ActiveMap legacy-lifecycle-mappings-by-packaging @@ -556,7 +556,7 @@ under the License. org.apache.maven.lifecycle.mapping.LifecycleMapping - + org.apache.maven.plugin.loader.PluginLoader default @@ -576,7 +576,7 @@ under the License. - + org.apache.maven.lifecycle.binding.LifecycleBindingManager default @@ -675,7 +675,7 @@ under the License. - + org.apache.maven.lifecycle.plan.BuildPlanner default @@ -692,7 +692,7 @@ under the License. - + org.apache.maven.lifecycle.binding.MojoBindingFactory default @@ -703,7 +703,7 @@ under the License. - + org.apache.maven.lifecycle.binding.LegacyLifecycleMappingParser default @@ -714,6 +714,22 @@ under the License. - + + + org.apache.maven.settings.validation.SettingsValidator + org.apache.maven.settings.validation.DefaultSettingsValidator + + + org.apache.maven.settings.MavenSettingsBuilder + org.apache.maven.settings.DefaultMavenSettingsBuilder + + + org.apache.maven.settings.validation.SettingsValidator + + + org.apache.maven.context.BuildContextManager + + + diff --git a/maven-settings/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java b/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java similarity index 100% rename from maven-settings/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java rename to maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java diff --git a/maven-settings/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java b/maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java similarity index 100% rename from maven-settings/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java rename to maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java index dad5a2fb3f..f77791a83e 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java +++ b/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; diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java index 0fc9920699..820e8ed86f 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java +++ b/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; diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java index 6689c275b0..9df329cbfa 100644 --- a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java +++ b/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; diff --git a/maven-project/pom.xml b/maven-project/pom.xml index c6175295c1..f8aed70f2b 100644 --- a/maven-project/pom.xml +++ b/maven-project/pom.xml @@ -42,11 +42,6 @@ under the License. maven-profile 2.1-SNAPSHOT - - org.apache.maven - maven-settings - 2.1-SNAPSHOT - org.apache.maven maven-model diff --git a/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java b/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java index af94640c4c..53b28f8a2b 100644 --- a/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java +++ b/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; diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml deleted file mode 100644 index b730060ea4..0000000000 --- a/maven-settings/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - maven - org.apache.maven - 2.1-SNAPSHOT - - 4.0.0 - maven-settings - Maven Local Settings Model - - - - org.codehaus.modello - modello-maven-plugin - - 1.0.0 - src/main/mdo/settings.mdo - - - - jdom - - jdom-writer - - - - - - - - - org.apache.maven - maven-model - 2.1-SNAPSHOT - - - org.apache.maven - maven-build-context - 2.1-SNAPSHOT - - - org.codehaus.plexus - plexus-container-default - - - - org.codehaus.plexus - plexus-utils - - - jdom - jdom - - - diff --git a/maven-settings/src/main/resources/META-INF/plexus/components.xml b/maven-settings/src/main/resources/META-INF/plexus/components.xml deleted file mode 100644 index a1f7011af1..0000000000 --- a/maven-settings/src/main/resources/META-INF/plexus/components.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - org.apache.maven.settings.validation.SettingsValidator - org.apache.maven.settings.validation.DefaultSettingsValidator - - - org.apache.maven.settings.MavenSettingsBuilder - org.apache.maven.settings.DefaultMavenSettingsBuilder - - - org.apache.maven.settings.validation.SettingsValidator - - - org.apache.maven.context.BuildContextManager - - - - - diff --git a/pom.xml b/pom.xml index 140efbc464..d1ebbcdc68 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,6 @@ under the License. maven-profile maven-project maven-reporting-api - maven-settings maven-embedder