brett       2004/07/07 03:09:08

  Modified:    src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
                        PluginManager.java
  Log:
  rename property to correct meaning, don't install to plugin directory
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.70.4.52 +4 -9      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.51
  retrieving revision 1.70.4.52
  diff -u -r1.70.4.51 -r1.70.4.52
  --- PluginManager.java        5 Jul 2004 21:01:48 -0000       1.70.4.51
  +++ PluginManager.java        7 Jul 2004 10:09:08 -0000       1.70.4.52
  @@ -806,17 +806,12 @@
        * @param parentProject the project to load the installed plugin into
        * @todo remove any old one
        */
  -    public void installPlugin( File file, Project parentProject, boolean 
installToUserPluginDirectory )
  +    public void installPlugin( File file, Project parentProject, boolean cache )
           throws MavenException
       {
  -        log.debug( "Using plugin dependency: " + file );
  +        log.debug( "Using plugin file: " + file );
           try
           {
  -            if ( installToUserPluginDirectory ) 
  -            {
  -                FileUtils.copyFileToDirectory( file, userPluginsDir );
  -            }
  -    
               String pluginName = file.getCanonicalFile().getName();
               pluginName = pluginName.substring( 0, pluginName.indexOf( ".jar" ) );
       
  @@ -836,7 +831,7 @@
                       housing.parse( transientMapper );
                       // Should only be putting in the transientMapper - but it is 
not consistent with isLoaded
                       housing.parse( mapper );
  -                    if ( installToUserPluginDirectory )
  +                    if ( cache )
                       {
                           cacheManager.registerPlugin( pluginName, housing );
                           housing.parse( cacheManager );
  
  
  

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

Reply via email to