Author: sisbell
Date: Thu Apr 2 00:04:51 2009
New Revision: 761112
URL: http://svn.apache.org/viewvc?rev=761112&view=rev
Log:
Further cleanup of maven project APIs.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileContext.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileContext.java?rev=761112&r1=761111&r2=761112&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileContext.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileContext.java
Thu Apr 2 00:04:51 2009
@@ -54,6 +54,8 @@
this.activeProfileIds = profileContextInfo.getActiveProfileIds();
this.inactiveProfileIds = profileContextInfo.getInactiveProfileIds();
}
+
+ // public Collection<Profile> getActiveProfilesFrom(ProfileManager manaa)
public Collection<Profile> getActiveProfiles()
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=761112&r1=761111&r2=761112&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Apr 2 00:04:51 2009
@@ -123,15 +123,17 @@
throws ProjectBuildingException
{
PomClassicDomainModel domainModel;
- try {
- domainModel = buildWithoutProfiles( "unknown", pomFile,
configuration.getLocalRepository(), configuration.getRemoteRepositories(),
configuration );
- } catch (IOException e) {
+ try
+ {
+ domainModel = buildWithoutProfiles( "unknown", pomFile,
configuration );
+ }
+ catch (IOException e)
+ {
throw new ProjectBuildingException("", "", e);
}
+
+ MavenProject project = buildWithProfiles( domainModel, configuration,
pomFile );
-
- MavenProject project = buildWithProfiles( domainModel, configuration,
pomFile, domainModel.getParentFile() );
- project.setFile( pomFile );
Build build = project.getBuild();
// NOTE: setting this script-source root before path translation,
because
// the plugin tools compose basedir and scriptSourceRoot into a single
file.
@@ -184,13 +186,16 @@
throw new ProjectBuildingException( artifact.getId(), "Error
resolving project artifact.", e );
}
PomClassicDomainModel domainModel;
- try {
- domainModel = buildWithoutProfiles( "unknown",
artifact.getFile(), configuration.getLocalRepository(),
- configuration.getRemoteRepositories(),
configuration );
- } catch (IOException e) {
+ try
+ {
+ domainModel = buildWithoutProfiles( "unknown",
artifact.getFile(), configuration );
+ }
+ catch (IOException e)
+ {
throw new ProjectBuildingException(artifact.getId(),
"Error reading project artifact.", e);
}
- project = buildWithProfiles( domainModel, configuration,
artifact.getFile(), domainModel.getParentFile() );
+
+ project = buildWithProfiles( domainModel, configuration,
artifact.getFile() );
artifact.setFile( artifact.getFile() );
project.setVersion( artifact.getVersion() );
@@ -200,6 +205,7 @@
return project;
}
+ //TODO: Get rid of this after merge of new PluginManager code
public MavenProject buildFromRepository( Artifact artifact,
List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository
)
throws ProjectBuildingException
{
@@ -284,7 +290,7 @@
return new MavenProjectBuildingResult( project, result );
}
- private MavenProject buildWithProfiles( PomClassicDomainModel domainModel,
ProjectBuilderConfiguration config, File projectDescriptor, File
parentDescriptor )
+ private MavenProject buildWithProfiles( PomClassicDomainModel domainModel,
ProjectBuilderConfiguration config, File projectDescriptor )
throws ProjectBuildingException
{
Model model;
@@ -296,6 +302,8 @@
{
throw new ProjectBuildingException("", e.getMessage());
}
+ File parentDescriptor = domainModel.getParentFile();
+
String projectId = safeVersionlessKey( model.getGroupId(),
model.getArtifactId() );
List<Profile> projectProfiles = new ArrayList<Profile>();
@@ -381,8 +389,7 @@
}
- private PomClassicDomainModel buildWithoutProfiles( String projectId, File
pomFile, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
ProjectBuilderConfiguration projectBuilderConfiguration )
+ private PomClassicDomainModel buildWithoutProfiles( String projectId, File
pomFile, ProjectBuilderConfiguration projectBuilderConfiguration )
throws ProjectBuildingException, IOException
{
@@ -392,8 +399,8 @@
List<String> inactiveProfileIds = ( projectBuilderConfiguration !=
null && projectBuilderConfiguration.getGlobalProfileManager() != null &&
projectBuilderConfiguration
.getGlobalProfileManager().getProfileActivationContext() != null )
?
projectBuilderConfiguration.getGlobalProfileManager().getProfileActivationContext().getExplicitlyInactiveProfileIds()
: new ArrayList<String>();
-
- return buildModel( pomFile, new ProfileContextInfo(null,
activeProfileIds, inactiveProfileIds), localRepository, remoteRepositories );
+
+ return buildModel( pomFile, new ProfileContextInfo(null,
activeProfileIds, inactiveProfileIds), projectBuilderConfiguration );
}
private void validateModel( Model model, File pomFile )
@@ -443,7 +450,7 @@
}
}
- private PomClassicDomainModel buildModel( File pom, ProfileContextInfo
profileInfo, ArtifactRepository localRepository, List<ArtifactRepository>
remoteRepositories )
+ private PomClassicDomainModel buildModel( File pom, ProfileContextInfo
profileInfo, ProjectBuilderConfiguration config )
throws IOException
{
if ( pom == null )
@@ -458,7 +465,9 @@
List<DomainModel> domainModels = new ArrayList<DomainModel>();
domainModels.add( domainModel );
-
+ ArtifactRepository localRepository = config.getLocalRepository();
+ List<ArtifactRepository> remoteRepositories =
config.getRemoteRepositories();
+
File parentFile = null;
int lineageCount = 0;
if ( domainModel.getParentId() != null )
