You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/09/07 07:25:50 UTC
svn commit: r573462 - in /maven/components/trunk: ./ maven-core/
maven-core/src/main/java/org/apache/maven/settings/
maven-core/src/main/mdo/ maven-core/src/main/resources/META-INF/plexus/
maven-core/src/test/java/org/apache/maven/settings/ maven-core/...
Author: jvanzyl
Date: Thu Sep 6 22:25:49 2007
New Revision: 573462
URL: http://svn.apache.org/viewvc?rev=573462&view=rev
Log:
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.
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/
- copied from r573172, maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java (contents, props changed)
- copied, changed from r573172, maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
maven/components/trunk/maven-core/src/main/mdo/
- copied from r573172, maven/components/trunk/maven-settings/src/main/mdo/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java (props changed)
- copied unchanged from r573172, maven/components/trunk/maven-settings/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/validation/
maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
- copied unchanged from r573172, maven/components/trunk/maven-settings/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java
Removed:
maven/components/trunk/maven-settings/
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-project/pom.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=573462&r1=573461&r2=573462&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Thu Sep 6 22:25:49 2007
@@ -41,11 +41,6 @@
<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>
<version>2.1-SNAPSHOT</version>
@@ -136,14 +131,28 @@
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
- </dependency>
+ </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>
Copied: maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java (from r573172, maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java?p2=maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java&p1=maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java&r1=573172&r2=573462&rev=573462&view=diff
==============================================================================
--- maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java Thu Sep 6 22:25:49 2007
@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.settings;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=573462&r1=573461&r2=573462&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Thu Sep 6 22:25:49 2007
@@ -43,7 +43,7 @@
</requirement>
</requirements>
</component>
-
+
<component>
<role>org.apache.maven.ArtifactFilterManager</role>
<implementation>org.apache.maven.DefaultArtifactFilterManager</implementation>
@@ -110,8 +110,8 @@
<role-hint>default</role-hint>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- <role-hint>default</role-hint>
+ <role>org.apache.maven.artifact.manager.WagonManager</role>
+ <role-hint>default</role-hint>
</requirement>
</requirements>
</component>
@@ -538,7 +538,7 @@
</requirement>
</requirements>
</component>
-
+
<component>
<role>org.codehaus.plexus.collections.ActiveMap</role>
<role-hint>lifecycle-loaders-by-packaging</role-hint>
@@ -547,7 +547,7 @@
<role>org.apache.maven.lifecycle.LifecycleBindingLoader</role>
</configuration>
</component>
-
+
<component>
<role>org.codehaus.plexus.collections.ActiveMap</role>
<role-hint>legacy-lifecycle-mappings-by-packaging</role-hint>
@@ -556,7 +556,7 @@
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
</configuration>
</component>
-
+
<component>
<role>org.apache.maven.plugin.loader.PluginLoader</role>
<role-hint>default</role-hint>
@@ -576,7 +576,7 @@
</requirement>
</requirements>
</component>
-
+
<component>
<role>org.apache.maven.lifecycle.binding.LifecycleBindingManager</role>
<role-hint>default</role-hint>
@@ -675,7 +675,7 @@
<!-- END SNIPPET: default-reports -->
</configuration>
</component>
-
+
<component>
<role>org.apache.maven.lifecycle.plan.BuildPlanner</role>
<role-hint>default</role-hint>
@@ -692,7 +692,7 @@
</requirement>
</requirements>
</component>
-
+
<component>
<role>org.apache.maven.lifecycle.binding.MojoBindingFactory</role>
<role-hint>default</role-hint>
@@ -703,7 +703,7 @@
</requirement>
</requirements>
</component>
-
+
<component>
<role>org.apache.maven.lifecycle.binding.LegacyLifecycleMappingParser</role>
<role-hint>default</role-hint>
@@ -714,6 +714,22 @@
</requirement>
</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>
Propchange: maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=573462&r1=573461&r2=573462&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Thu Sep 6 22:25:49 2007
@@ -20,7 +20,7 @@
*/
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;
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=573462&r1=573461&r2=573462&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Thu Sep 6 22:25:49 2007
@@ -20,7 +20,7 @@
*/
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;
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=573462&r1=573461&r2=573462&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Thu Sep 6 22:25:49 2007
@@ -20,9 +20,8 @@
*/
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;
Modified: maven/components/trunk/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=573462&r1=573461&r2=573462&view=diff
==============================================================================
--- maven/components/trunk/maven-project/pom.xml (original)
+++ maven/components/trunk/maven-project/pom.xml Thu Sep 6 22:25:49 2007
@@ -44,11 +44,6 @@
</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>
<version>2.1-SNAPSHOT</version>
</dependency>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java?rev=573462&r1=573461&r2=573462&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/manager/ProfileManager.java Thu Sep 6 22:25:49 2007
@@ -21,7 +21,6 @@
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;
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=573462&r1=573461&r2=573462&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Sep 6 22:25:49 2007
@@ -118,7 +118,6 @@
<module>maven-profile</module>
<module>maven-project</module>
<module>maven-reporting-api</module>
- <module>maven-settings</module>
<module>maven-embedder</module>
</modules>
<properties>