evenisse 2004/07/02 03:55:20
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
Fix installation checker.
Revision Changes Path
No revision
No revision
1.70.4.50 +9 -7 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.70.4.49
retrieving revision 1.70.4.50
diff -u -r1.70.4.49 -r1.70.4.50
--- PluginManager.java 1 Jul 2004 20:20:36 -0000 1.70.4.49
+++ PluginManager.java 2 Jul 2004 10:55:19 -0000 1.70.4.50
@@ -228,6 +228,13 @@
setPluginsDir( new File( mavenSession.getRootContext().getPluginsDir() ) );
setUnpackedPluginsDir( new File(
mavenSession.getRootContext().getUnpackedPluginsDir() ) );
setUserPluginsDir( new File(
mavenSession.getRootContext().getUserPluginsDir() ) );
+
+ if ( !getPluginsDir().isDirectory() ||
+ ( getPluginsDir().listFiles() != null &&
+ getPluginsDir().listFiles().length == 0 ) )
+ {
+ throw new MavenException( "Maven was badly installed. Please reinstall
it." );
+ }
if ( log.isDebugEnabled() )
{
@@ -243,14 +250,9 @@
Map pluginFiles = getPluginFiles( pluginsDir, true );
Map userPluginFiles = getPluginFiles( userPluginsDir, false );
- if ( !Collections.EMPTY_MAP.equals( userPluginFiles ) &&
- Collections.EMPTY_MAP.hashCode() == userPluginFiles.hashCode() )
+ if ( !userPluginFiles.isEmpty() )
{
pluginFiles.putAll( userPluginFiles );
- }
- else
- {
- throw new MavenException( "Maven was badly installed. Please reinstall
it." );
}
Map pluginDirs = expandPluginFiles( pluginFiles );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
