You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/05/31 23:48:56 UTC
svn commit: r179289 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/profiles
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/settings
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings
/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus
/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin
/maven/components/trunk/maven-profile /maven/components/trunk/maven-settings
Author: jdcasey
Date: Tue May 31 14:48:55 2005
New Revision: 179289
URL: http://svn.apache.org/viewcvs?rev=179289&view=rev
Log:
Moved the packages org.apache.maven.model.settings and org.apache.maven.model.profiles to org.apache.maven.settings and org.apache.maven.profiles, respectively.
This is restoring the settings to their original package structure, and putting profiles next to it...the change I'm reversing was not a good one, conceptually.
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/
- copied from r179233, maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/profiles/
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/
- copied from r179233, maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/settings/
Removed:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/profiles/DefaultMavenProfilesBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/profiles/MavenProfilesBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/profiles/ModelNormalizationUtils.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/settings/DefaultMavenSettingsBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/model/settings/MavenSettingsBuilder.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
maven/components/trunk/maven-profile/profiles.mdo
maven/components/trunk/maven-settings/settings.mdo
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Tue May 31 14:48:55 2005
@@ -24,10 +24,6 @@
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
-import org.apache.maven.model.settings.Mirror;
-import org.apache.maven.model.settings.Proxy;
-import org.apache.maven.model.settings.Server;
-import org.apache.maven.model.settings.Settings;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.plugin.MojoExecutionException;
@@ -36,6 +32,10 @@
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectSorter;
import org.apache.maven.reactor.ReactorException;
+import org.apache.maven.settings.Mirror;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
import org.apache.maven.usability.ErrorDiagnoser;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Tue May 31 14:48:55 2005
@@ -33,13 +33,13 @@
import org.apache.maven.execution.MavenExecutionResponse;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.model.settings.MavenSettingsBuilder;
-import org.apache.maven.model.settings.Settings;
import org.apache.maven.monitor.event.DefaultEventDispatcher;
import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.reactor.ReactorException;
+import org.apache.maven.settings.MavenSettingsBuilder;
+import org.apache.maven.settings.Settings;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Tue May 31 14:48:55 2005
@@ -17,9 +17,9 @@
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.settings.Settings;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.EventMonitor;
+import org.apache.maven.settings.Settings;
import java.util.List;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Tue May 31 14:48:55 2005
@@ -17,9 +17,9 @@
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.settings.Settings;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.EventMonitor;
+import org.apache.maven.settings.Settings;
import java.util.List;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Tue May 31 14:48:55 2005
@@ -17,9 +17,9 @@
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.settings.Settings;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue May 31 14:48:55 2005
@@ -25,7 +25,6 @@
import org.apache.maven.model.Goal;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
-import org.apache.maven.model.settings.Settings;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.PluginManagerException;
@@ -34,6 +33,7 @@
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.injection.ModelDefaultsInjector;
+import org.apache.maven.settings.Settings;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.ArrayList;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java?rev=179289&r1=179233&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java Tue May 31 14:48:55 2005
@@ -1,6 +1,7 @@
-package org.apache.maven.model.profiles;
+package org.apache.maven.profiles;
-import org.apache.maven.model.profiles.io.xpp3.ProfilesXpp3Reader;
+import org.apache.maven.profiles.ProfilesRoot;
+import org.apache.maven.profiles.io.xpp3.ProfilesXpp3Reader;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java?rev=179289&r1=179233&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java Tue May 31 14:48:55 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.model.profiles;
+package org.apache.maven.profiles;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.profiles.ProfilesRoot;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java?rev=179289&r1=179233&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java Tue May 31 14:48:55 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.model.profiles;
+package org.apache.maven.profiles;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
@@ -29,7 +29,7 @@
{
}
- public static Profile convertFromSettingsProfile( org.apache.maven.model.settings.Profile settingsProfile )
+ public static Profile convertFromSettingsProfile( org.apache.maven.settings.Profile settingsProfile )
{
Profile profile = new Profile();
profile.setConfiguration( settingsProfile.getConfiguration() );
@@ -39,7 +39,7 @@
{
for ( Iterator it = repos.iterator(); it.hasNext(); )
{
- profile.addRepository( convertFromSettingsRepository( (org.apache.maven.model.settings.Repository) it.next() ) );
+ profile.addRepository( convertFromSettingsRepository( (org.apache.maven.settings.Repository) it.next() ) );
}
}
@@ -48,14 +48,14 @@
{
for ( Iterator it = pluginRepos.iterator(); it.hasNext(); )
{
- profile.addPluginRepository( convertFromSettingsRepository( (org.apache.maven.model.settings.Repository) it.next() ) );
+ profile.addPluginRepository( convertFromSettingsRepository( (org.apache.maven.settings.Repository) it.next() ) );
}
}
return profile;
}
- public static Profile convertFromProfileXmlProfile( org.apache.maven.model.profiles.Profile profileXmlProfile )
+ public static Profile convertFromProfileXmlProfile( org.apache.maven.profiles.Profile profileXmlProfile )
{
Profile profile = new Profile();
profile.setConfiguration( profileXmlProfile.getConfiguration() );
@@ -65,7 +65,7 @@
{
for ( Iterator it = repos.iterator(); it.hasNext(); )
{
- profile.addRepository( convertFromSettingsRepository( (org.apache.maven.model.settings.Repository) it.next() ) );
+ profile.addRepository( convertFromSettingsRepository( (org.apache.maven.settings.Repository) it.next() ) );
}
}
@@ -74,14 +74,14 @@
{
for ( Iterator it = pluginRepos.iterator(); it.hasNext(); )
{
- profile.addPluginRepository( convertFromSettingsRepository( (org.apache.maven.model.settings.Repository) it.next() ) );
+ profile.addPluginRepository( convertFromSettingsRepository( (org.apache.maven.settings.Repository) it.next() ) );
}
}
return profile;
}
- private static Repository convertFromSettingsRepository( org.apache.maven.model.settings.Repository settingsRepo )
+ private static Repository convertFromSettingsRepository( org.apache.maven.settings.Repository settingsRepo )
{
Repository repo = new Repository();
@@ -94,7 +94,7 @@
return repo;
}
- private static Repository convertFromProfileXmlRepository( org.apache.maven.model.profiles.Repository profileXmlRepo )
+ private static Repository convertFromProfileXmlRepository( org.apache.maven.profiles.Repository profileXmlRepo )
{
Repository repo = new Repository();
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=179289&r1=179233&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Tue May 31 14:48:55 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.model.settings;
+package org.apache.maven.settings;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.model.settings.Settings;
-import org.apache.maven.model.settings.io.xpp3.SettingsXpp3Reader;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.IOUtil;
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java?rev=179289&r1=179233&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java Tue May 31 14:48:55 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.model.settings;
+package org.apache.maven.settings;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.model.settings.Settings;
+import org.apache.maven.settings.Settings;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.IOException;
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=179289&r1=179288&r2=179289&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 Tue May 31 14:48:55 2005
@@ -164,8 +164,8 @@
</component>
<component>
- <role>org.apache.maven.model.settings.MavenSettingsBuilder</role>
- <implementation>org.apache.maven.model.settings.DefaultMavenSettingsBuilder</implementation>
+ <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+ <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
<configuration>
<settingsPath>${user.home}/.m2/settings.xml</settingsPath>
</configuration>
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java Tue May 31 14:48:55 2005
@@ -21,9 +21,9 @@
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
-import org.apache.maven.model.settings.Settings;
import org.apache.maven.monitor.event.DefaultEventDispatcher;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
Modified: maven/components/trunk/maven-profile/profiles.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-profile/profiles.mdo?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-profile/profiles.mdo (original)
+++ maven/components/trunk/maven-profile/profiles.mdo Tue May 31 14:48:55 2005
@@ -8,7 +8,7 @@
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.model.profiles</value>
+ <value>org.apache.maven.profiles</value>
</default>
</defaults>
<classes>
Modified: maven/components/trunk/maven-settings/settings.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-settings/settings.mdo?rev=179289&r1=179288&r2=179289&view=diff
==============================================================================
--- maven/components/trunk/maven-settings/settings.mdo (original)
+++ maven/components/trunk/maven-settings/settings.mdo Tue May 31 14:48:55 2005
@@ -8,7 +8,7 @@
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.model.settings</value>
+ <value>org.apache.maven.settings</value>
</default>
</defaults>
<classes>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org