dion 2003/09/24 23:18:14
Modified: src/java/org/apache/maven/plugin PluginManager.java
Log:
Fix for MAVEN-659. Remove .processed checking for plugins.
Revision Changes Path
1.70 +2 -41 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- PluginManager.java 23 Sep 2003 02:08:29 -0000 1.69
+++ PluginManager.java 25 Sep 2003 06:18:14 -0000 1.70
@@ -347,12 +347,6 @@
}
invalidateCache( directory );
- File processed = getPluginProcessedMarker( unzipDir.getName() );
- if ( processed.exists() )
- {
- processed.delete();
- }
-
try
{
Expand unzipper = new Expand();
@@ -718,15 +712,7 @@
false ); // FIXME - this should be true, but
// it means the plugins parent must be
// placed into the unpacked dir
-
- if ( !isPluginProcessed( name ) )
- {
- pluginProject.verifyDependencies();
-
- // Mark the plugin as processed.
- FileUtils.fileWrite( getPluginProcessedMarker( name ).getPath(),
- "plugin has been processed.");
- }
+ pluginProject.verifyDependencies();
// place dependencies on the right classloaders
pluginProject.processDependencies();
@@ -883,31 +869,6 @@
Set getTagLibsCache()
{
return cacheManager.getDynaTagLibCache().keySet();
- }
-
- /**
- * Retrieve the plugin processed marker.
- *
- * @param pluginName Name of the plugin for which to return the processed
marker.
- *
- * @return File The file which indicates the plugin has been processed.
- */
- File getPluginProcessedMarker( String pluginName )
- {
- return new File( new File( getUnpackedPluginsDir(), pluginName ),
- ".processed" );
- }
-
- /**
- * Plugin processed state.
- *
- * @param pluginName Name of the plugin for which to check for processing.
- *
- * @return boolean Processed state of plugin.
- */
- boolean isPluginProcessed( String pluginName )
- {
- return getPluginProcessedMarker( pluginName ).exists();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
