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/08/19 18:41:57 UTC
svn commit: r805876 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin:
DefaultPluginCache.java PluginCache.java
Author: bentmann
Date: Wed Aug 19 16:41:56 2009
New Revision: 805876
URL: http://svn.apache.org/viewvc?rev=805876&view=rev
Log:
o Removed obsolete code (plugin descriptors are cached by dedicated component)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java?rev=805876&r1=805875&r2=805876&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java Wed Aug 19 16:41:56 2009
@@ -31,7 +31,6 @@
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.ModelUtils;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
@@ -88,8 +87,6 @@
}
}
- protected final Map<CacheKey, PluginDescriptor> descriptorsCache = new HashMap<CacheKey, PluginDescriptor>();
-
protected final Map<CacheKey, CacheRecord> cache = new HashMap<CacheKey, CacheRecord>();
public CacheRecord get( Plugin plugin, ArtifactRepository localRepository,
@@ -98,41 +95,6 @@
return cache.get( new CacheKey( plugin, localRepository, remoteRepositories ) );
}
- public PluginDescriptor getPluginDescriptor( Plugin plugin, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories )
- {
- return clone( descriptorsCache.get( new CacheKey( plugin, localRepository, remoteRepositories ) ) );
- }
-
- protected static PluginDescriptor clone( PluginDescriptor original )
- {
- if ( original == null )
- {
- return null;
- }
-
- PluginDescriptor cloned = new PluginDescriptor();
- cloned.setGroupId( original.getGroupId() );
- cloned.setArtifactId( original.getArtifactId() );
- cloned.setVersion( original.getVersion() );
- cloned.setGoalPrefix( original.getGoalPrefix() );
- cloned.setSource( original.getSource() );
- cloned.setInheritedByDefault( original.isInheritedByDefault() );
-
- cloned.setIntroducedDependencyArtifacts( original.getIntroducedDependencyArtifacts() ); // TODO do we need to clone this?
- cloned.setName( original.getName() );
- cloned.setDescription( original.getDescription() );
- cloned.setPlugin( ModelUtils.clonePlugin( original.getPlugin() ) ); // TODO not sure I need to clone here
- cloned.setPluginArtifact( original.getPluginArtifact() );
-
- cloned.setId( original.getId() );
- cloned.setIsolatedRealm( original.isIsolatedRealm() );
- cloned.setComponents( original.getComponents() );
- cloned.setDependencies( original.getDependencies() );
-
- return cloned;
- }
-
public void put( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
ClassRealm pluginRealm, List<Artifact> pluginArtifacts )
{
@@ -152,17 +114,9 @@
cache.put( key, record );
}
- public void putPluginDescriptor( Plugin plugin, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories, PluginDescriptor pluginDescriptor )
- {
- CacheKey key = new CacheKey( plugin, localRepository, remoteRepositories );
- descriptorsCache.put( key, clone( pluginDescriptor ) );
- }
-
public void flush()
{
cache.clear();
- descriptorsCache.clear();
}
protected static int pluginHashCode( Plugin plugin )
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java?rev=805876&r1=805875&r2=805876&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginCache.java Wed Aug 19 16:41:56 2009
@@ -24,7 +24,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
public interface PluginCache
@@ -42,12 +41,6 @@
}
}
- PluginDescriptor getPluginDescriptor( Plugin plugin, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories );
-
- void putPluginDescriptor( Plugin plugin, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories, PluginDescriptor pluginDescriptor );
-
CacheRecord get( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories );
void put( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,