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

Moved profile classes into main project package. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748889 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-02-28 17:26:56 +00:00
parent b216d61448
commit b487a2fd45
18 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,13 +11,9 @@
import org.apache.maven.model.Parent; import org.apache.maven.model.Parent;
import org.apache.maven.model.Profile; import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository; import org.apache.maven.model.Repository;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException; import org.apache.maven.project.*;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException;

3
maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
View File

@ -5,8 +5,7 @@
import org.apache.maven.model.Model; import org.apache.maven.model.Model;
import org.apache.maven.model.Profile; import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository; import org.apache.maven.model.Repository;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectModelException; import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException; import org.apache.maven.project.InvalidProjectVersionException;

2
maven-core/src/main/java/org/apache/maven/errors/ProjectErrorTips.java
View File

@ -5,8 +5,6 @@
import org.apache.maven.model.Model; import org.apache.maven.model.Model;
import org.apache.maven.model.Profile; import org.apache.maven.model.Profile;
import org.apache.maven.model.RepositoryBase; import org.apache.maven.model.RepositoryBase;
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.execution.DuplicateProjectException; import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.InvalidProjectVersionException; import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;

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

@ -24,8 +24,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.errors.CoreErrorReporter; import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor; import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.profiles.ProfileManager; import org.apache.maven.project.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.project.DefaultProjectBuilderConfiguration; import org.apache.maven.project.DefaultProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuilderConfiguration; import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.realm.MavenRealmManager;

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

@ -28,8 +28,8 @@
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.errors.CoreErrorReporter; import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor; import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.profiles.ProfileManager; import org.apache.maven.project.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.project.ProjectBuilderConfiguration; import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.realm.MavenRealmManager; import org.apache.maven.realm.MavenRealmManager;
import org.apache.maven.settings.Settings; import org.apache.maven.settings.Settings;

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

@ -38,9 +38,9 @@
import org.apache.maven.model.Repository; import org.apache.maven.model.Repository;
import org.apache.maven.monitor.event.DefaultEventMonitor; import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.monitor.event.EventMonitor; import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.profiles.DefaultProfileManager; import org.apache.maven.project.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager; import org.apache.maven.project.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.realm.DefaultMavenRealmManager; import org.apache.maven.realm.DefaultMavenRealmManager;
import org.apache.maven.repository.MavenRepositorySystem; import org.apache.maven.repository.MavenRepositorySystem;
import org.apache.maven.settings.MavenSettingsBuilder; import org.apache.maven.settings.MavenSettingsBuilder;

8
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -37,10 +37,10 @@
import org.apache.maven.model.Profile; import org.apache.maven.model.Profile;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.profiles.ProfileManager; import org.apache.maven.project.ProfileManager;
import org.apache.maven.profiles.DefaultProfileManager; import org.apache.maven.project.DefaultProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.project.ProfileActivationException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.builder.*; import org.apache.maven.project.builder.*;
import org.apache.maven.project.builder.profile.ProfileContext; import org.apache.maven.project.builder.profile.ProfileContext;

19
maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java → maven-project/src/main/java/org/apache/maven/project/DefaultProfileManager.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.profiles; package org.apache.maven.project;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -24,8 +24,9 @@
import org.apache.maven.model.Profile; import org.apache.maven.model.Profile;
import org.apache.maven.model.Parent; import org.apache.maven.model.Parent;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer; import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.project.ProfileActivationException;
import org.apache.maven.project.ProfileManager;
import org.apache.maven.shared.model.ModelContainer; import org.apache.maven.shared.model.ModelContainer;
import org.apache.maven.shared.model.ModelProperty; import org.apache.maven.shared.model.ModelProperty;
import org.apache.maven.shared.model.ModelMarshaller; import org.apache.maven.shared.model.ModelMarshaller;
@ -105,7 +106,7 @@ public Map getProfilesById()
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#addProfile(org.apache.maven.model.Profile) * @see org.apache.maven.project.ProfileManager#addProfile(org.apache.maven.model.Profile)
*/ */
public void addProfile( Profile profile ) public void addProfile( Profile profile )
{ {
@ -129,7 +130,7 @@ public void addProfile( Profile profile )
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.lang.String) * @see org.apache.maven.project.ProfileManager#explicitlyActivate(java.lang.String)
*/ */
public void explicitlyActivate( String profileId ) public void explicitlyActivate( String profileId )
{ {
@ -143,7 +144,7 @@ public void explicitlyActivate( String profileId )
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.util.List) * @see org.apache.maven.project.ProfileManager#explicitlyActivate(java.util.List)
*/ */
public void explicitlyActivate( List profileIds ) public void explicitlyActivate( List profileIds )
{ {
@ -156,7 +157,7 @@ public void explicitlyActivate( List profileIds )
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.lang.String) * @see org.apache.maven.project.ProfileManager#explicitlyDeactivate(java.lang.String)
*/ */
public void explicitlyDeactivate( String profileId ) public void explicitlyDeactivate( String profileId )
{ {
@ -170,7 +171,7 @@ public void explicitlyDeactivate( String profileId )
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.util.List) * @see org.apache.maven.project.ProfileManager#explicitlyDeactivate(java.util.List)
*/ */
public void explicitlyDeactivate( List profileIds ) public void explicitlyDeactivate( List profileIds )
{ {
@ -341,7 +342,7 @@ private boolean isActive( Profile profile, ProfileActivationContext context )
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.maven.profiles.ProfileManager#addProfiles(java.util.List) * @see org.apache.maven.project.ProfileManager#addProfiles(java.util.List)
*/ */
public void addProfiles( List profiles ) public void addProfiles( List profiles )
{ {

2
maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
View File

@ -24,7 +24,7 @@
import java.util.Properties; import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager; import org.apache.maven.project.ProfileManager;
import org.apache.maven.shared.model.ModelEventListener; import org.apache.maven.shared.model.ModelEventListener;
public class DefaultProjectBuilderConfiguration public class DefaultProjectBuilderConfiguration

2
maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
View File

@ -17,7 +17,7 @@
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager; import org.apache.maven.project.ProfileManager;
import org.apache.maven.project.builder.PomClassicDomainModel; import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.shared.model.InterpolatorProperty; import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.model.Model; import org.apache.maven.model.Model;

2
maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationContext.java → maven-project/src/main/java/org/apache/maven/project/ProfileActivationContext.java
View File

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

2
maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java → maven-project/src/main/java/org/apache/maven/project/ProfileActivationException.java
View File

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

6
maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java → maven-project/src/main/java/org/apache/maven/project/ProfileManager.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.profiles; package org.apache.maven.project;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -21,8 +21,8 @@
import org.apache.maven.model.Model; import org.apache.maven.model.Model;
import org.apache.maven.model.Profile; import org.apache.maven.model.Profile;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.project.ProfileActivationException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

4
maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
View File

@ -1,9 +1,7 @@
package org.apache.maven.project; package org.apache.maven.project;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager; import org.apache.maven.project.ProfileManager;
import org.apache.maven.shared.model.ModelEventListener;
import org.codehaus.plexus.PlexusContainer;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

2
maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
View File

@ -4,7 +4,7 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.project.ProfileActivationException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException;

6
maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
View File

@ -23,9 +23,9 @@
import org.apache.maven.model.ActivationOS; import org.apache.maven.model.ActivationOS;
import org.apache.maven.model.ActivationProperty; import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile; import org.apache.maven.model.Profile;
import org.apache.maven.profiles.DefaultProfileManager; import org.apache.maven.project.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager; import org.apache.maven.project.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.PlexusTestCase;
import java.util.List; import java.util.List;

4
maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
View File

@ -22,8 +22,8 @@
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.profiles.DefaultProfileManager; import org.apache.maven.project.DefaultProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.project.validation.ModelValidationResult; import org.apache.maven.project.validation.ModelValidationResult;
import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.PlexusTestCase;

4
maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
View File

@ -24,8 +24,8 @@
import java.io.FileInputStream; import java.io.FileInputStream;
import java.util.*; import java.util.*;
import org.apache.maven.profiles.DefaultProfileManager; import org.apache.maven.project.DefaultProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext; import org.apache.maven.project.ProfileActivationContext;
import org.apache.maven.model.Model; import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;