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 2008/09/18 13:39:17 UTC
svn commit: r696637 - in /maven/components:
branches/jvz/maven-core/src/main/resources/META-INF/plexus/
branches/jvz/maven-project/src/main/java/org/apache/maven/project/
branches/jvz/maven-project/src/main/resources/META-INF/plexus/
trunk/maven-core/s...
Author: jvanzyl
Date: Thu Sep 18 04:39:16 2008
New Revision: 696637
URL: http://svn.apache.org/viewvc?rev=696637&view=rev
Log:
o match shane's changes to remove the workspace
Modified:
maven/components/branches/jvz/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
Modified: maven/components/branches/jvz/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=696637&r1=696636&r2=696637&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/jvz/maven-core/src/main/resources/META-INF/plexus/components.xml Thu Sep 18 04:39:16 2008
@@ -207,9 +207,6 @@
<implementation>org.apache.maven.extension.lineage.DefaultModelLineageBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- </requirement>
- <requirement>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
Modified: maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=696637&r1=696636&r2=696637&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/jvz/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Sep 18 04:39:16 2008
@@ -48,7 +48,6 @@
import org.apache.maven.project.builder.PomClassicTransformer;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
-import org.apache.maven.project.workspace.ProjectWorkspace;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -92,8 +91,6 @@
private MavenTools mavenTools;
- private ProjectWorkspace projectWorkspace;
-
private ProjectBuilder projectBuilder;
private RepositoryHelper repositoryHelper;
@@ -132,11 +129,7 @@
public MavenProject build( File projectDescriptor, ProjectBuilderConfiguration config )
throws ProjectBuildingException
{
- MavenProject project = projectWorkspace.getProject( projectDescriptor );
-
- if ( project == null )
- {
- project = readModelFromLocalPath( "unknown", projectDescriptor, new PomArtifactResolver(
+ MavenProject project = readModelFromLocalPath( "unknown", projectDescriptor, new PomArtifactResolver(
config.getLocalRepository(), repositoryHelper.buildArtifactRepositories(
getSuperProject( config, projectDescriptor, true ).getModel() ), artifactResolver ), config );
@@ -153,7 +146,6 @@
setBuildOutputDirectoryOnParent( project );
- }
return project;
}
@@ -176,12 +168,7 @@
throws ProjectBuildingException
{
MavenProject project = null;
- if ( !Artifact.LATEST_VERSION.equals( artifact.getVersion() ) &&
- !Artifact.RELEASE_VERSION.equals( artifact.getVersion() ) )
- {
- project =
- projectWorkspace.getProject( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
- }
+
File f = artifact.getFile();
if ( project == null )
{
@@ -440,9 +427,6 @@
externalProfileManager ) );
project.setActiveProfiles( projectProfiles );
- projectWorkspace.storeProjectByCoordinate( project );
- projectWorkspace.storeProjectByFile( project );
-
return project;
}
Modified: maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=696637&r1=696636&r2=696637&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/jvz/maven-project/src/main/resources/META-INF/plexus/components.xml Thu Sep 18 04:39:16 2008
@@ -93,9 +93,6 @@
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<requirement>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
</requirement>
<requirement>
@@ -278,17 +275,5 @@
</requirement>
</requirements>
</component>
-
- <component>
- <role>org.apache.maven.project.workspace.ProjectWorkspace</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.maven.project.workspace.DefaultProjectWorkspace</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.workspace.MavenWorkspaceStore</role>
- </requirement>
- </requirements>
- </component>
-
</components>
</component-set>
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java?rev=696637&r1=696636&r2=696637&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java Thu Sep 18 04:39:16 2008
@@ -35,7 +35,6 @@
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ModelAndFile;
-import org.apache.maven.project.workspace.ProjectWorkspace;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -69,8 +68,6 @@
private ProfileAdvisor profileAdvisor;
- private ProjectWorkspace projectWorkspace;
-
private Logger logger;
public DefaultModelLineageBuilder()
@@ -99,12 +96,7 @@
List currentRemoteRepositories = remoteRepositories == null ? new ArrayList()
: new ArrayList( remoteRepositories );
- ModelAndFile current = projectWorkspace.getModelAndFile( pom );
- if ( current == null )
- {
- current = new ModelAndFile( readModel( pom ), pom, isReactorProject );
- projectWorkspace.storeModelAndFile( current );
- }
+ ModelAndFile current = new ModelAndFile( readModel( pom ), pom, isReactorProject );
do
{
@@ -314,7 +306,6 @@
// getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using file: " + parentPomFile );
- result = projectWorkspace.getModelAndFile( parentPomFile );
if ( result != null && !parentModelMatches( modelParent, result.getModel() ) )
{
parentPomFile = null;
@@ -322,13 +313,6 @@
}
}
- if ( result == null )
- {
-// getLogger().debug( "Checking cache for parent model-and-file instance: " + key + " using project groupId:artifactId:version." );
-
- result = projectWorkspace.getModelAndFile( modelParent.getGroupId(), modelParent.getArtifactId(), modelParent.getVersion() );
- }
-
if ( result != null )
{
// getLogger().debug( "Returning cached instance." );
@@ -421,12 +405,6 @@
}
}
- if ( result != null )
- {
-// getLogger().debug( "Caching parent model-and-file: " + result );
- projectWorkspace.storeModelAndFile( result );
- }
-
return result;
}