Author: bentmann
Date: Tue Sep 29 09:46:01 2009
New Revision: 819871
URL: http://svn.apache.org/viewvc?rev=819871&view=rev
Log:
o Unified code
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java?rev=819871&r1=819870&r2=819871&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
Tue Sep 29 09:46:01 2009
@@ -106,9 +106,9 @@
return cache.get( new CacheKey( plugin, parentRealm, parentImports,
localRepository, remoteRepositories ) );
}
- public void put( Plugin plugin, ClassLoader parentRealm, List<String>
parentImports,
- ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
- ClassRealm pluginRealm, List<Artifact> pluginArtifacts )
+ public CacheRecord put( Plugin plugin, ClassLoader parentRealm,
List<String> parentImports,
+ ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
+ ClassRealm pluginRealm, List<Artifact>
pluginArtifacts )
{
if ( pluginRealm == null || pluginArtifacts == null )
{
@@ -123,7 +123,10 @@
}
CacheRecord record = new CacheRecord( pluginRealm, pluginArtifacts );
+
cache.put( key, record );
+
+ return record;
}
public void flush()
@@ -234,7 +237,7 @@
return s1 != null ? s1.equals( s2 ) : s2 == null;
}
- public void register( MavenProject project, ClassRealm pluginRealm )
+ public void register( MavenProject project, CacheRecord record )
{
// default cache does not track plugin usage
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java?rev=819871&r1=819870&r2=819871&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
Tue Sep 29 09:46:01 2009
@@ -53,19 +53,20 @@
CacheRecord get( Plugin plugin, ClassLoader parentRealm, List<String>
parentImports,
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories );
- void put( Plugin plugin, ClassLoader parentRealm, List<String>
parentImports, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories, ClassRealm
pluginRealm, List<Artifact> pluginArtifacts );
+ CacheRecord put( Plugin plugin, ClassLoader parentRealm, List<String>
parentImports,
+ ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
+ ClassRealm pluginRealm, List<Artifact> pluginArtifacts );
void flush();
/**
- * Registers the specified plugin realm for usage with the given project.
Integrators can use the information
- * collected from this method in combination with a custom cache
implementation to dispose unused plugin realms from
- * the cache.
+ * Registers the specified cache record for usage with the given project.
Integrators can use the information
+ * collected from this method in combination with a custom cache
implementation to dispose unused records from the
+ * cache.
*
* @param project The project that employs the plugin realm, must not be
{...@code null}.
- * @param pluginRealm The plugin realm being used for the project, must
not be {...@code null}.
+ * @param record The cache record being used for the project, must not be
{...@code null}.
*/
- void register( MavenProject project, ClassRealm pluginRealm );
+ void register( MavenProject project, CacheRecord record );
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java?rev=819871&r1=819870&r2=819871&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
Tue Sep 29 09:46:01 2009
@@ -315,12 +315,13 @@
{
createPluginRealm( pluginDescriptor, session, parent, imports );
- pluginRealmCache.put( plugin, parent, imports,
session.getLocalRepository(),
- project.getPluginArtifactRepositories(),
pluginDescriptor.getClassRealm(),
- pluginDescriptor.getArtifacts() );
+ cacheRecord =
+ pluginRealmCache.put( plugin, parent, imports,
session.getLocalRepository(),
+ project.getPluginArtifactRepositories(),
pluginDescriptor.getClassRealm(),
+ pluginDescriptor.getArtifacts() );
}
- pluginRealmCache.register( project, pluginDescriptor.getClassRealm() );
+ pluginRealmCache.register( project, cacheRecord );
}
private void createPluginRealm( PluginDescriptor pluginDescriptor,
MavenSession session, ClassLoader parent,
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java?rev=819871&r1=819870&r2=819871&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
Tue Sep 29 09:46:01 2009
@@ -362,11 +362,11 @@
extensionArtifactFilter = new ExclusionSetFilter( exclusions );
}
- projectRealmCache.put( extensionRealms, projectRealm,
extensionArtifactFilter );
-
- record = new ProjectRealmCache.CacheRecord( projectRealm,
extensionArtifactFilter );
+ record = projectRealmCache.put( extensionRealms, projectRealm,
extensionArtifactFilter );
}
+ projectRealmCache.register( project, record );
+
return record;
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java?rev=819871&r1=819870&r2=819871&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
Tue Sep 29 09:46:01 2009
@@ -83,8 +83,8 @@
return cache.get( new CacheKey( extensionRealms ) );
}
- public void put( List<? extends ClassRealm> extensionRealms, ClassRealm
projectRealm,
- ArtifactFilter extensionArtifactFilter )
+ public CacheRecord put( List<? extends ClassRealm> extensionRealms,
ClassRealm projectRealm,
+ ArtifactFilter extensionArtifactFilter )
{
if ( projectRealm == null )
{
@@ -99,7 +99,10 @@
}
CacheRecord record = new CacheRecord( projectRealm,
extensionArtifactFilter );
+
cache.put( key, record );
+
+ return record;
}
public void flush()
@@ -107,4 +110,9 @@
cache.clear();
}
+ public void register( MavenProject project, CacheRecord record )
+ {
+ // default cache does not track record usage
+ }
+
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java?rev=819871&r1=819870&r2=819871&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
Tue Sep 29 09:46:01 2009
@@ -52,9 +52,19 @@
CacheRecord get( List<? extends ClassRealm> extensionRealms );
- void put( List<? extends ClassRealm> extensionRealms, ClassRealm
projectRealm,
- ArtifactFilter extensionArtifactFilter );
+ CacheRecord put( List<? extends ClassRealm> extensionRealms, ClassRealm
projectRealm,
+ ArtifactFilter extensionArtifactFilter );
void flush();
+ /**
+ * Registers the specified cache record for usage with the given project.
Integrators can use the information
+ * collected from this method in combination with a custom cache
implementation to dispose unused records from the
+ * cache.
+ *
+ * @param project The project that employs the plugin realm, must not be
{...@code null}.
+ * @param record The cache record being used for the project, must not be
{...@code null}.
+ */
+ void register( MavenProject project, CacheRecord record );
+
}
