Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179289 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-05-31 21:48:55 +00:00
parent 25fb7c646d
commit 215c30bbb3
15 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -24,10 +24,6 @@ import org.apache.maven.execution.MavenExecutionResponse;
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.MavenProjectBuilder;
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;

4
maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -33,13 +33,13 @@ import org.apache.maven.execution.MavenExecutionRequest;
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;

2
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -17,9 +17,9 @@ package org.apache.maven.execution;
*/
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;

2
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
View File

@ -17,9 +17,9 @@ package org.apache.maven.execution;
*/
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;

2
maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
View File

@ -17,9 +17,9 @@ package org.apache.maven.execution;
*/
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;

2
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -25,7 +25,6 @@ import org.apache.maven.execution.MavenSession;
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.MojoDescriptor;
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;

5
maven-core/src/main/java/org/apache/maven/model/profiles/DefaultMavenProfilesBuilder.java → maven-core/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
View File

@ -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;

3
maven-core/src/main/java/org/apache/maven/model/profiles/MavenProfilesBuilder.java → maven-core/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
View File

@ -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 @@ package org.apache.maven.model.profiles;
* limitations under the License.
*/
import org.apache.maven.profiles.ProfilesRoot;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;

18
maven-core/src/main/java/org/apache/maven/model/profiles/ModelNormalizationUtils.java → maven-core/src/main/java/org/apache/maven/profiles/ModelNormalizationUtils.java
View File

@ -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 final class ModelNormalizationUtils
{
}
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 @@ public final class ModelNormalizationUtils
{
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 @@ public final class ModelNormalizationUtils
{
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 @@ public final class ModelNormalizationUtils
{
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 @@ public final class ModelNormalizationUtils
{
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 @@ public final class ModelNormalizationUtils
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();

6
maven-core/src/main/java/org/apache/maven/model/settings/DefaultMavenSettingsBuilder.java → maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
View File

@ -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 @@ package org.apache.maven.model.settings;
* 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;

4
maven-core/src/main/java/org/apache/maven/model/settings/MavenSettingsBuilder.java → maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
View File

@ -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 @@ package org.apache.maven.model.settings;
* 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;

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

@ -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>

2
maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
View File

@ -21,9 +21,9 @@ import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
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;

2
maven-profile/profiles.mdo
View File

@ -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>

2
maven-settings/settings.mdo
View File

@ -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>