brett       2004/11/04 07:17:57

  Modified:    src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
                        PluginManager.java
  Log:
  warn on duplicated plugins
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.70.4.56 +7 -1      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.55
  retrieving revision 1.70.4.56
  diff -u -r1.70.4.55 -r1.70.4.56
  --- PluginManager.java        4 Nov 2004 15:09:58 -0000       1.70.4.55
  +++ PluginManager.java        4 Nov 2004 15:17:57 -0000       1.70.4.56
  @@ -317,6 +317,11 @@
   
       void mapArtifactIdToPluginHousing( String artifactId, JellyScriptHousing 
housing )
       {
  +        if ( artifactIdToHousingMap.containsKey( artifactId ) )
  +        {
  +            JellyScriptHousing h = (JellyScriptHousing) artifactIdToHousingMap.get( 
artifactId );
  +            log.warn("WARNING: Plugin '" + artifactId + "' is already loaded from " 
+ h.getName() + "; attempting to load " + housing.getName());
  +        }
           artifactIdToHousingMap.put( artifactId, housing );
       }
   
  @@ -845,6 +850,7 @@
                           pluginHousings.remove( oldHousing.getName() );
                           mapper.invalidatePlugin( oldHousing );
                           transientMapper.invalidatePlugin( oldHousing );
  +                        artifactIdToHousingMap.remove( artifactId );
                       }
   
                       mapArtifactIdToPluginHousing( artifactId, housing );
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to