cvs commit: maven-components/maven-core/src/java/org/apache/maven/plugin DefaultPluginManagerManager.java

[jvanzyl]

jvanzyl     2004/02/14 17:53:33

  Modified:    maven-core/src/java/org/apache/maven/plugin
                        DefaultPluginManagerManager.java
  Log:
  o look for plugin descriptors in META-INF/maven/plugin.xml
  
  Revision  Changes    Path
  1.7       +3 -3      
maven-components/maven-core/src/java/org/apache/maven/plugin/DefaultPluginManagerManager.java
  
  Index: DefaultPluginManagerManager.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/DefaultPluginManagerManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultPluginManagerManager.java  15 Feb 2004 01:42:30 -0000      1.6
  +++ DefaultPluginManagerManager.java  15 Feb 2004 01:53:33 -0000      1.7
  @@ -90,6 +90,8 @@
       extends AbstractLogEnabled
       implements PluginManagerManager, Contextualizable, Initializable
   {
  +    static String PLUGIN_DESCRIPTOR = "META-INF/maven/plugin.xml";
  +
       private ClassRealm rootClassRealm;
   
       // Components
  @@ -219,8 +221,6 @@
           }
       }
   
  -    static String PLUGIN_RESOURCES = "META-INF/plexus/plugin.xml";
  -
       public List findPlugins( ClassLoader classLoader )
       {
           if ( classLoader == null )
  @@ -232,7 +232,7 @@
   
           try
           {
  -            for ( Enumeration e = classLoader.getResources( PLUGIN_RESOURCES ); 
e.hasMoreElements(); )
  +            for ( Enumeration e = classLoader.getResources( PLUGIN_DESCRIPTOR ); 
e.hasMoreElements(); )
               {
                   URL url = (URL) e.nextElement();
   
  
  
  

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