You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/09/22 15:10:47 UTC
svn commit: r817646 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin: DefaultBuildPluginManager.java DefaultPluginCache.java DefaultPluginRealmCache.java PluginCache.java PluginRealmCache.java

Author: bentmann
Date: Tue Sep 22 13:10:47 2009
New Revision: 817646

URL: http://svn.apache.org/viewvc?rev=817646&view=rev
Log:
o Renamed classes to better describe purpose

Added:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
      - copied, changed from r817546, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
      - copied, changed from r817546, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java
Removed:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java
Modified:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java?rev=817646&r1=817645&r2=817646&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java Tue Sep 22 13:10:47 2009
@@ -47,7 +47,7 @@
     private PlexusContainer container;
 
     @Requirement
-    private PluginCache pluginCache;
+    private PluginRealmCache pluginCache;
 
     @Requirement
     private MavenPluginManager mavenPluginManager;
@@ -158,7 +158,7 @@
         ArtifactRepository localRepository = session.getLocalRepository();
         List<ArtifactRepository> remoteRepositories = project.getPluginArtifactRepositories();
 
-        PluginCache.CacheRecord cacheRecord = pluginCache.get( plugin, project, localRepository, remoteRepositories );
+        PluginRealmCache.CacheRecord cacheRecord = pluginCache.get( plugin, project, localRepository, remoteRepositories );
 
         if ( cacheRecord != null )
         {

Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java (from r817546, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java&r1=817546&r2=817646&rev=817646&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java Tue Sep 22 13:10:47 2009
@@ -37,9 +37,9 @@
 /**
  * Default PluginCache implementation. Assumes cached data does not change.
  */
-@Component( role = PluginCache.class )
-public class DefaultPluginCache
-    implements PluginCache
+@Component( role = PluginRealmCache.class )
+public class DefaultPluginRealmCache
+    implements PluginRealmCache
 {
 
     protected static class CacheKey

Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java (from r817546, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java&r1=817546&r2=817646&rev=817646&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java Tue Sep 22 13:10:47 2009
@@ -27,7 +27,7 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
 
-public interface PluginCache
+public interface PluginRealmCache
 {
     
     public static class CacheRecord