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:46:14 UTC
svn commit: r696638 -
/maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
Author: jvanzyl
Date: Thu Sep 18 04:46:13 2008
New Revision: 696638
URL: http://svn.apache.org/viewvc?rev=696638&view=rev
Log: (empty)
Modified:
maven/components/branches/jvz/maven-core/src/main/java/org/apache/maven/extension/lineage/DefaultModelLineageBuilder.java
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=696638&r1=696637&r2=696638&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 Thu Sep 18 04:46:13 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;
}