Author: joakime
Date: Fri Feb 2 20:28:21 2007
New Revision: 503171
URL: http://svn.apache.org/viewvc?view=rev&rev=503171
Log:
Updated maven-project to utilize plexus-cache w/hashmap provider.
Seems to pass all integration tests ok.
Review?
Added:
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.xml
(with props)
Modified:
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/maven-trunk-caching-update/maven-project/pom.xml
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Modified:
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Fri Feb 2 20:28:21 2007
@@ -50,6 +50,7 @@
import org.apache.maven.usability.diagnostics.ErrorDiagnostics;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.cache.Cache;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -64,10 +65,8 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.TimeZone;
/**
@@ -96,6 +95,8 @@
protected RuntimeInformation runtimeInformation;
private BuildExtensionScanner buildExtensionScanner;
+
+ private Cache pomFileCache;
private static final long MB = 1024 * 1024;
@@ -345,17 +346,13 @@
throw new MavenExecutionException( "Error selecting project files
for the reactor: " + e.getMessage(), e );
}
- // TODO: We should probably do this discovery just-in-time, if we can
move to building project
- // instances just-in-time.
- Map cache = new HashMap();
-
for ( Iterator it = files.iterator(); it.hasNext(); )
{
File pom = (File) it.next();
try
{
- buildExtensionScanner.scanForBuildExtensions( pom,
request.getLocalRepository(), globalProfileManager, cache );
+ buildExtensionScanner.scanForBuildExtensions( pom,
request.getLocalRepository(), globalProfileManager, pomFileCache );
}
catch ( ExtensionScanningException e )
{
Modified:
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java
Fri Feb 2 20:28:21 2007
@@ -2,16 +2,16 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager;
+import org.codehaus.plexus.cache.Cache;
import java.io.File;
-import java.util.Map;
public interface BuildExtensionScanner
{
String ROLE = BuildExtensionScanner.class.getName();
- void scanForBuildExtensions( File pom, ArtifactRepository localRepository,
ProfileManager globalProfileManager, Map pomFilesById )
+ void scanForBuildExtensions( File pom, ArtifactRepository localRepository,
ProfileManager globalProfileManager, Cache pomFilesById )
throws ExtensionScanningException;
}
Modified:
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java
Fri Feb 2 20:28:21 2007
@@ -19,12 +19,12 @@
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.apache.maven.project.interpolation.ModelInterpolator;
import org.codehaus.plexus.PlexusContainerException;
+import org.codehaus.plexus.cache.Cache;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import java.io.File;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -48,7 +48,7 @@
private ModelInterpolator modelInterpolator;
public void scanForBuildExtensions( File pom, ArtifactRepository
localRepository,
- ProfileManager globalProfileManager,
Map pomFilesById )
+ ProfileManager globalProfileManager,
Cache pomFilesById )
throws ExtensionScanningException
{
// setup the CustomActivatorAdvice to fail quietly while we discover
extensions...then, we'll
@@ -110,7 +110,7 @@
private void checkModulesForExtensions( File containingPom, Model model,
ArtifactRepository localRepository,
List originalRemoteRepositories,
ProfileManager globalProfileManager,
- Map pomFilesById )
+ Cache pomFilesById )
throws ExtensionScanningException
{
// FIXME: This gets a little sticky, because modules can be added by
profiles that require
@@ -199,7 +199,7 @@
private ModelLineage buildModelLineage( File pom, ArtifactRepository
localRepository,
List originalRemoteRepositories,
ProfileManager globalProfileManager,
- Map cache )
+ Cache cache )
throws ExtensionScanningException
{
ModelLineage lineage;
Modified:
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-core/src/main/resources/META-INF/plexus/components.xml
Fri Feb 2 20:28:21 2007
@@ -128,6 +128,11 @@
<requirement>
<role>org.apache.maven.execution.RuntimeInformation</role>
</requirement>
+ <requirement>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>cache-PomFilesById</role-hint>
+ <field-name>pomFileCache</field-name>
+ </requirement>
</requirements>
</component>
Modified:
maven/components/branches/maven-trunk-caching-update/maven-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/pom.xml?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
--- maven/components/branches/maven-trunk-caching-update/maven-project/pom.xml
(original)
+++ maven/components/branches/maven-trunk-caching-update/maven-project/pom.xml
Fri Feb 2 20:28:21 2007
@@ -78,6 +78,11 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus.cache</groupId>
+ <artifactId>plexus-cache-hashmap</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
Modified:
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Fri Feb 2 20:28:21 2007
@@ -63,6 +63,7 @@
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.cache.Cache;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
@@ -150,9 +151,9 @@
private ModelValidator validator;
- private Map processedProjectCache = new HashMap();
+ private Cache processedProjectCache;
- private Map cachedPomFilesByModelId = new HashMap();
+ private Cache cachedPomFilesByModelId;
// TODO: make it a component
private MavenXpp3Reader modelReader;
Modified:
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
Fri Feb 2 20:28:21 2007
@@ -14,6 +14,7 @@
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.build.profile.ProfileAdvisor;
+import org.codehaus.plexus.cache.Cache;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -28,7 +29,6 @@
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
/**
@@ -64,7 +64,7 @@
* @see
org.apache.maven.project.build.model.ModelLineageBuilder#buildModelLineage(java.io.File,
org.apache.maven.artifact.repository.ArtifactRepository, java.util.List)
*/
public ModelLineage buildModelLineage( File pom, ArtifactRepository
localRepository, List remoteRepositories,
- ProfileManager profileManager, Map
cachedPomFilesByModelId )
+ ProfileManager profileManager,
Cache cachedPomFilesByModelId )
throws ProjectBuildingException
{
ModelLineage lineage = new DefaultModelLineage();
@@ -96,7 +96,7 @@
}
public void resumeBuildingModelLineage( ModelLineage lineage,
ArtifactRepository localRepository,
- ProfileManager profileManager, Map
cachedPomFilesByModelId )
+ ProfileManager profileManager,
Cache cachedPomFilesByModelId )
throws ProjectBuildingException
{
File pomFile = lineage.getDeepestFile();
@@ -146,7 +146,7 @@
* Read the Model instance from the given POM file, and cache it in the
given Map before
* returning it.
*/
- private Model readModel( File pomFile, Map cachedPomFilesByModelId )
+ private Model readModel( File pomFile, Cache cachedPomFilesByModelId )
throws ProjectBuildingException
{
return readModel( pomFile, cachedPomFilesByModelId, false );
@@ -157,7 +157,7 @@
* Model instance in the given Map before returning it. The skipCache flag
controls whether the
* Model instance is actually cached.
*/
- private Model readModel( File pom, Map cachedPomFilesByModelId, boolean
skipCache )
+ private Model readModel( File pom, Cache cachedPomFilesByModelId, boolean
skipCache )
throws ProjectBuildingException
{
File pomFile = pom;
@@ -268,7 +268,7 @@
* @param cachedModelsById
*/
private File resolveParentPom( Model model, List remoteRepositories,
ArtifactRepository localRepository,
- File modelPomFile, Map cachedModelsById )
+ File modelPomFile, Cache cachedModelsById )
throws ProjectBuildingException
{
Parent modelParent = model.getParent();
Modified:
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/java/org/apache/maven/project/build/model/ModelLineageBuilder.java
Fri Feb 2 20:28:21 2007
@@ -3,10 +3,10 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.ProjectBuildingException;
+import org.codehaus.plexus.cache.Cache;
import java.io.File;
import java.util.List;
-import java.util.Map;
/**
* Builds the lineage of Model instances, starting from a given POM file, and
stretching back through
@@ -37,7 +37,7 @@
* have an incorrect relativePath
*/
ModelLineage buildModelLineage( File pom, ArtifactRepository
localRepository, List remoteRepositories,
- ProfileManager profileManager, Map
cachedPomFilesByModelId )
+ ProfileManager profileManager, Cache
cachedPomFilesByModelId )
throws ProjectBuildingException;
/**
@@ -53,7 +53,7 @@
* have an incorrect relativePath
*/
void resumeBuildingModelLineage( ModelLineage lineage, ArtifactRepository
localRepository,
- ProfileManager profileManager, Map
cachedPomFilesByModelId )
+ ProfileManager profileManager, Cache
cachedPomFilesByModelId )
throws ProjectBuildingException;
}
Modified:
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-project/src/main/resources/META-INF/plexus/components.xml
Fri Feb 2 20:28:21 2007
@@ -87,6 +87,26 @@
|
-->
<component>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>projectBuilder-processed</role-hint>
+
<implementation>org.codehaus.plexus.cache.hashmap.HashMapCache</implementation>
+ <configuration>
+ <cache-hit-ratio>1.0</cache-hit-ratio>
+ <cache-max-size>0</cache-max-size>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>cache-PomFilesById</role-hint>
+
<implementation>org.codehaus.plexus.cache.hashmap.HashMapCache</implementation>
+ <configuration>
+ <cache-hit-ratio>1.0</cache-hit-ratio>
+ <cache-max-size>0</cache-max-size>
+ </configuration>
+ </component>
+
+ <component>
<role>org.apache.maven.project.MavenProjectBuilder</role>
<implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
<requirements>
@@ -131,6 +151,16 @@
</requirement>
<requirement>
<role>org.apache.maven.MavenTools</role>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>projectBuilder-processed</role-hint>
+ <field-name>processedProjectCache</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>cache-PomFilesById</role-hint>
+ <field-name>cachedPomFilesByModelId</field-name>
</requirement>
</requirements>
</component>
Modified:
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java
Fri Feb 2 20:28:21 2007
@@ -8,6 +8,7 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.project.ProjectBuildingException;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.cache.Cache;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
@@ -16,9 +17,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
-import java.util.Map;
public class DefaultModelLineageBuilderTest
extends PlexusTestCase
@@ -27,12 +26,16 @@
private DefaultModelLineageBuilder modelLineageBuilder;
private ArtifactRepositoryLayout defaultLayout;
+
+ private Cache testCache;
public void setUp()
throws Exception
{
super.setUp();
getContainer().getLoggerManager().setThresholds( Logger.LEVEL_DEBUG );
+
+ testCache = (Cache) lookup( Cache.ROLE, "testCache" );
modelLineageBuilder = (DefaultModelLineageBuilder) lookup(
ModelLineageBuilder.ROLE,
DefaultModelLineageBuilder.ROLE_HINT );
@@ -40,6 +43,13 @@
defaultLayout = (ArtifactRepositoryLayout) lookup(
ArtifactRepositoryLayout.ROLE, "default" );
}
+ protected void tearDown()
+ throws Exception
+ {
+ release( testCache );
+ super.tearDown();
+ }
+
public void testShouldReadSinglePomWithNoParents()
throws IOException, ProjectBuildingException
{
@@ -68,7 +78,7 @@
IOUtil.close( writer );
}
- ModelLineage lineage = modelLineageBuilder.buildModelLineage( pomFile,
null, null, null, new HashMap() );
+ ModelLineage lineage = modelLineageBuilder.buildModelLineage( pomFile,
null, null, null, testCache );
assertEquals( 1, lineage.size() );
@@ -126,7 +136,7 @@
.toExternalForm(), defaultLayout );
ModelLineage lineage = modelLineageBuilder.buildModelLineage(
currentPOM, localRepository,
-
Collections.EMPTY_LIST, null, new HashMap() );
+
Collections.EMPTY_LIST, null, testCache );
assertEquals( 3, lineage.size() );
@@ -198,7 +208,7 @@
.toExternalForm(), defaultLayout );
ModelLineage lineage = modelLineageBuilder.buildModelLineage(
currentPOM, localRepository, Collections
- .singletonList( remoteRepository ), null, new HashMap() );
+ .singletonList( remoteRepository ), null, testCache );
assertEquals( 3, lineage.size() );
@@ -253,7 +263,7 @@
.toExternalForm(), defaultLayout );
ModelLineage lineage = modelLineageBuilder.buildModelLineage(
currentPOM, localRepository,
-
Collections.EMPTY_LIST, null, new HashMap() );
+
Collections.EMPTY_LIST, null, testCache );
assertEquals( 2, lineage.size() );
@@ -314,8 +324,7 @@
// 4. write the parent model to the local repo directory
writeModel( parent, parentPOM );
- Map cache = new HashMap();
- cache.put( "group:parent:1", parentPOM );
+ testCache.put( "group:parent:1", parentPOM );
// 5. create the current pom with a parent-ref on the parent model
Model current = createModel( "group", "current", "1" );
@@ -336,13 +345,12 @@
// 7. build the lineage.
ModelLineage lineage = modelLineageBuilder.buildModelLineage(
currentPOM, null, Collections
- .EMPTY_LIST, null, cache );
+ .EMPTY_LIST, null, testCache );
assertEquals( 2, lineage.size() );
Iterator modelIterator = lineage.modelIterator();
- assertEquals( 2, cache.size() );
assertEquals( current.getId(), ( (Model) modelIterator.next()
).getId() );
assertEquals( parent.getId(), ( (Model) modelIterator.next() ).getId()
);
}
Modified:
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Fri Feb 2 20:28:21 2007
@@ -98,6 +98,16 @@
<requirement>
<role>org.apache.maven.MavenTools</role>
</requirement>
+ <requirement>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>projectBuilder-processed</role-hint>
+ <field-name>processedProjectCache</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>cache-PomFilesById</role-hint>
+ <field-name>cachedPomFilesByModelId</field-name>
+ </requirement>
</requirements>
</component>
</components>
Added:
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.xml?view=auto&rev=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.xml
(added)
+++
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.xml
Fri Feb 2 20:28:21 2007
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<plexus>
+ <components>
+
+ <component>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>testCache</role-hint>
+
<implementation>org.codehaus.plexus.cache.hashmap.HashMapCache</implementation>
+ <configuration>
+ <cache-hit-ratio>1.0</cache-hit-ratio>
+ <cache-max-size>0</cache-max-size>
+ </configuration>
+ </component>
+
+ </components>
+</plexus>
\ No newline at end of file
Propchange:
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?view=diff&rev=503171&r1=503170&r2=503171
==============================================================================
---
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
(original)
+++
maven/components/branches/maven-trunk-caching-update/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Fri Feb 2 20:28:21 2007
@@ -98,6 +98,16 @@
<role>org.apache.maven.context.BuildContextManager</role>
<role-hint>default</role-hint>
</requirement>
+ <requirement>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>projectBuilder-processed</role-hint>
+ <field-name>processedProjectCache</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>cache-PomFilesById</role-hint>
+ <field-name>cachedPomFilesByModelId</field-name>
+ </requirement>
</requirements>
</component>
</components>
