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/27 20:11:58 UTC
svn commit: r699705 - in /maven/components/branches/jvz:
maven-core/src/main/java/org/apache/maven/extension/lineage/
maven-project/src/test/resources/org/apache/maven/project/
maven-project/src/test/resources/org/apache/maven/project/canonical/
Author: jvanzyl
Date: Sat Sep 27 11:11:58 2008
New Revision: 699705
URL: http://svn.apache.org/viewvc?rev=699705&view=rev
Log:
o getting rid of workspace references
Modified:
maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Modified: maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java?rev=699705&r1=699704&r2=699705&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java (original)
+++ maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java Sat Sep 27 11:11:58 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 = current = new ModelAndFile( readModel( pom ), pom, isReactorProject );
do
{
@@ -311,32 +303,8 @@
{
parentPomFile = new File( parentPomFile, "pom.xml" );
}
-
-// 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;
- result = null;
- }
}
- 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." );
- return result;
- }
-
-// getLogger().debug( "Allowing parent-model resolution to proceed for: " + key + " (child is: " + model.getId() + ")" );
-
if ( parentPomFile != null )
{
if ( parentPomFile.exists() )
@@ -421,12 +389,6 @@
}
}
- if ( result != null )
- {
-// getLogger().debug( "Caching parent model-and-file: " + result );
- projectWorkspace.storeModelAndFile( result );
- }
-
return result;
}
Modified: maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=699705&r1=699704&r2=699705&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Sat Sep 27 11:11:58 2008
@@ -124,9 +124,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.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>
Modified: maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=699705&r1=699704&r2=699705&view=diff
==============================================================================
--- maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml (original)
+++ maven/components/branches/jvz/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml Sat Sep 27 11:11:58 2008
@@ -121,9 +121,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.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>
</requirement>