Author: jvanzyl
Date: Mon May 11 05:20:53 2009
New Revision: 773470
URL: http://svn.apache.org/viewvc?rev=773470&view=rev
Log: (empty)
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginClassLoaderCache.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginClassLoaderCache.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginClassLoaderCache.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginClassLoaderCache.java?rev=773470&r1=773469&r2=773470&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginClassLoaderCache.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginClassLoaderCache.java
Mon May 11 05:20:53 2009
@@ -12,12 +12,12 @@
{
private Map<String,ClassRealm> pluginClassLoaders = new
HashMap<String,ClassRealm>();
- public void cachePluginClassLoader( String key, ClassRealm
pluginClassLoader )
+ public void put( String key, ClassRealm pluginClassLoader )
{
pluginClassLoaders.put( key, pluginClassLoader );
}
- public ClassRealm getPluginClassLoader( String key )
+ public ClassRealm get( String key )
{
return pluginClassLoaders.get( key );
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=773470&r1=773469&r2=773470&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Mon May 11 05:20:53 2009
@@ -198,7 +198,7 @@
}
}
- //pluginRealm.display();
+ pluginRealm.display();
try
{
@@ -215,7 +215,7 @@
throw new PluginContainerException( plugin, pluginRealm, "Error
scanning plugin realm for components.", e );
}
- pluginClassLoaderCache.cachePluginClassLoader( constructPluginKey(
plugin ), pluginRealm );
+ pluginClassLoaderCache.put( constructPluginKey( plugin ), pluginRealm
);
PluginDescriptor pluginDescriptor = getPluginDescriptor( plugin );
@@ -345,7 +345,7 @@
mojo = getConfiguredMojo( session, mojoExecution, project, false,
mojoExecution );
//pluginRealm = pluginDescriptor.getClassRealm();
- pluginRealm = pluginClassLoaderCache.getPluginClassLoader(
constructPluginKey( mojoDescriptor.getPluginDescriptor() ) );
+ pluginRealm = pluginClassLoaderCache.get( constructPluginKey(
mojoDescriptor.getPluginDescriptor() ) );
Thread.currentThread().setContextClassLoader( pluginRealm );
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginClassLoaderCache.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginClassLoaderCache.java?rev=773470&r1=773469&r2=773470&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginClassLoaderCache.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginClassLoaderCache.java
Mon May 11 05:20:53 2009
@@ -13,7 +13,7 @@
*/
public interface PluginClassLoaderCache
{
- void cachePluginClassLoader( String key, ClassRealm pluginClassLoader );
+ void put( String key, ClassRealm pluginClassLoader );
- ClassRealm getPluginClassLoader( String key );
+ ClassRealm get( String key );
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=773470&r1=773469&r2=773470&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
Mon May 11 05:20:53 2009
@@ -166,7 +166,7 @@
value = project.getExecutionProject();
}
else if ( expression.startsWith( "project" ) || expression.startsWith(
"pom" ) )
- {
+ {
try
{
int pathSeparator = expression.indexOf( "/" );
@@ -187,7 +187,7 @@
// TODO: don't catch exception
throw new ExpressionEvaluationException( "Error evaluating
plugin parameter expression: " + expression,
e );
- }
+ }
}
else if ( expression.equals( "mojo" ) )
{
