You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by pl...@apache.org on 2003/05/05 01:39:03 UTC

cvs commit: maven/src/java/org/apache/maven/plugin DefaultPluginManager.java PluginCacheManager.java PluginManager.java

plynch      2003/05/04 16:39:03

  Modified:    src/java/org/apache/maven MavenConstants.java
               src/java/org/apache/maven/ant MavenTask.java
               src/java/org/apache/maven/cli App.java
               src/java/org/apache/maven/jelly MavenJellyContext.java
               src/java/org/apache/maven/plugin DefaultPluginManager.java
                        PluginCacheManager.java PluginManager.java
  Log:
  Applying MAVEN-302 from Aslak Hellesoy <as...@netcom.no> with the following modifications:
  
  o Did not remove MavenConstants import use from PluginManager.java
  o changed MAVEN_LOCAL_HOME to MAVEN_HOME_LOCAL to be consistent with maven.repo.remote, maven.repo.local
  o made the default MAVEN_HOME_LOCAL be ${user.home}/.maven instead of MAVEN_HOME if MAVEN_HOME_LOCAL was not specified.
  o as I couldn't get the the users home dir in a batch file on windows, I instead set the default maven.home.local property in driver.properties
  o fixed typo in patch unpakcedPluginDir to unpackedPluginDir where appropriate
  o added a bit more logging
  o corrected provided logging by checking isInfoEnabled() and isDebugEnabled() before logging
  o fixed MAVEN_HOME_LOCAL path for cygwin in 'maven' script. Otherwise the patch caused exceptions to get thrown
  o :chkMLocalHome in maven.bat removed cause the default is set in driver.properties. Good thing too as labels can only be eight characters on win98/me I believe
  o adjusted the build-bootstrap.xml to copy phase-1 install to maven.home.local
  o in 'maven' and 'maven.bat' only pass maven.home.local to maven executable if it is defined
  o removing trailing line endings in a few places
  
  Revision  Changes    Path
  1.26      +7 -4      maven/src/java/org/apache/maven/MavenConstants.java
  
  Index: MavenConstants.java
  ===================================================================
  RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenConstants.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- MavenConstants.java	12 Apr 2003 00:02:05 -0000	1.25
  +++ MavenConstants.java	4 May 2003 23:39:03 -0000	1.26
  @@ -81,9 +81,6 @@
        */
       public static final int POM_VERSION = 3;
   
  -    /** MavenSession home tag. */
  -    public static final String HOME = "maven.home";
  -
       /** Online tag. */
       public static final String ONLINE = "maven.mode.online";
   
  @@ -127,6 +124,12 @@
   
       /** MavenSession home context tag **/
       public static final String MAVEN_HOME = "maven.home";
  +
  +    /** MavenSession home local context tag **/
  +    public static final String MAVEN_HOME_LOCAL = "maven.home.local";
  +
  +    /** MavenSession unpacked plugins context tag **/
  +    public static final String MAVEN_UNPACKED_PLUGINS_DIR = "maven.plugin.unpacked.dir";
   
       /** MavenSession build file url context tag **/
       public static final String MAVEN_BUILD_FILE_URL = "maven.project.buildFile.url";
  
  
  
  1.13      +1 -1      maven/src/java/org/apache/maven/ant/MavenTask.java
  
  Index: MavenTask.java
  ===================================================================
  RCS file: /home/cvs/maven/src/java/org/apache/maven/ant/MavenTask.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MavenTask.java	27 Feb 2003 13:15:36 -0000	1.12
  +++ MavenTask.java	4 May 2003 23:39:03 -0000	1.13
  @@ -210,7 +210,7 @@
           // I'm pretty sure this isn't the *best* way to get the job
           // done but at the same time I'm pretty sure it *is* the
           // quickest means to my desired end...
  -        System.setProperty( MavenConstants.HOME, this.getMavenHome() );
  +        System.setProperty( MavenConstants.MAVEN_HOME, this.getMavenHome() );
           System.setProperty( "forehead.conf.file",
                               this.getMavenHome() + "/bin/forehead.conf" );
           System.setProperty( "tools.jar", this.getToolsJar() );
  
  
  
  1.27      +5 -5      maven/src/java/org/apache/maven/cli/App.java
  
  Index: App.java
  ===================================================================
  RCS file: /home/cvs/maven/src/java/org/apache/maven/cli/App.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- App.java	30 Apr 2003 07:23:48 -0000	1.26
  +++ App.java	4 May 2003 23:39:03 -0000	1.27
  @@ -489,7 +489,7 @@
               exit( returnCode );
               return;
           }
  -        
  +
           if ( getCli().hasOption( DISPLAY_VERSION ) )
           {
               printConsoleMavenHeader();
  @@ -505,7 +505,7 @@
           }
   
           //printConsoleProjectHeader( project );
  -        System.out.println();
  +        //System.out.println();
   
           boolean failed = false;
   
  @@ -1087,8 +1087,8 @@
           App app = new App();
           app.doMain( args, start );
       }
  -    
  -    
  +
  +
       /**
        * To allow subclasses stop the app from exiting
        */
  
  
  
  1.31      +24 -3     maven/src/java/org/apache/maven/jelly/MavenJellyContext.java
  
  Index: MavenJellyContext.java
  ===================================================================
  RCS file: /home/cvs/maven/src/java/org/apache/maven/jelly/MavenJellyContext.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- MavenJellyContext.java	12 Apr 2003 00:02:06 -0000	1.30
  +++ MavenJellyContext.java	4 May 2003 23:39:03 -0000	1.31
  @@ -327,7 +327,7 @@
       }
   
       /**
  -     * Set the mavenRepoRemote attribute.
  +     * Set the location of the local maven repository.
        *
        * @param mavenRepoLocal The local repository.
        */
  @@ -337,7 +337,7 @@
       }
   
       /**
  -     * Get the mavenRepoRemote attribute.
  +     * Get the location of the local maven repository.
        *
        * @return The local repository.
        */
  @@ -653,4 +653,25 @@
               }
           }
       }
  +
  +    /**
  +     * Get local maven home.
  +     *
  +     * @return location of Maven local home installation.
  +     */
  +    public String getMavenHomeLocal()
  +    {
  +        return (String) getVariable( MavenConstants.MAVEN_HOME_LOCAL );
  +    }
  +
  +    /**
  +     * Get unpacked plugins location.
  +     *
  +     * @return unpacked plugins location.
  +     */
  +    public String getUnpackedPluginsDir()
  +    {
  +        return (String) getVariable( MavenConstants.MAVEN_UNPACKED_PLUGINS_DIR );
  +    }
  +
   }
  
  
  
  1.6       +2 -2      maven/src/java/org/apache/maven/plugin/DefaultPluginManager.java
  
  Index: DefaultPluginManager.java
  ===================================================================
  RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/DefaultPluginManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultPluginManager.java	9 Apr 2003 08:15:23 -0000	1.5
  +++ DefaultPluginManager.java	4 May 2003 23:39:03 -0000	1.6
  @@ -240,7 +240,7 @@
   
           setPluginsDir( new File( mavenSession.getRootContext().getMavenHome(), "plugins" ) );
   
  -        cacheManager.setPluginsDir( getPluginsDir() );
  +        cacheManager.setUnpackedPluginsDir( getPluginsDir() );
           cacheManager.loadCache();
   
           File[] files = getPluginsDir().listFiles();
  
  
  
  1.11      +25 -20    maven/src/java/org/apache/maven/plugin/PluginCacheManager.java
  
  Index: PluginCacheManager.java
  ===================================================================
  RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginCacheManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PluginCacheManager.java	24 Apr 2003 19:28:54 -0000	1.10
  +++ PluginCacheManager.java	4 May 2003 23:39:03 -0000	1.11
  @@ -99,6 +99,9 @@
       /** Plugin -> dynatag dependencies. */
       public static final String PLUGIN_DYNATAG_DEPS_CACHE = "plugin-dynatag-deps.cache";
   
  +    /** The directory where plugins are unpacked */
  +    private File unpackedPluginsDir;
  +
       /** Currently executing plugin script. */
       private File pluginScript;
   
  @@ -292,26 +295,24 @@
           return pluginScript;
       }
   
  -    private File pluginsDir;
  -
       /**
  -     * Set the pluginsDir attribute.
  +     * Set the unpackedPluginsDir attribute.
        *
  -     * @param pluginsDir
  +     * @param unpackedPluginsDir
        */
  -    public void setPluginsDir( File pluginsDir )
  +    public void setUnpackedPluginsDir( File unpackedPluginsDir )
       {
  -        this.pluginsDir = pluginsDir;
  +        this.unpackedPluginsDir = unpackedPluginsDir;
       }
   
       /**
  -     * Get the pluginsDir attribute.
  +     * Get the unpackedPluginsDir attribute.
        *
  -     * @return The
  +     * @return The directory ( as a File ) where the plugins are unpacked.
        */
  -    public File getPluginsDir()
  +    public File getUnpackedPluginsDir()
       {
  -        return pluginsDir;
  +        return unpackedPluginsDir;
       }
   
       /**
  @@ -364,20 +365,24 @@
       public void saveCache()
           throws Exception
       {
  +        if( log.isInfoEnabled() )
  +        {
  +           log.info( "Saving caches to " + getUnpackedPluginsDir().getAbsolutePath() );
  +        }
           getPluginCache().store(
  -            new FileOutputStream( new File( getPluginsDir(), PLUGINS_CACHE ) ), "plugins cache" );
  +            new FileOutputStream( new File( getUnpackedPluginsDir(), PLUGINS_CACHE ) ), "plugins cache" );
   
           getGoalCache().store(
  -            new FileOutputStream( new File( getPluginsDir(), GOALS_CACHE ) ), "goals cache" );
  +            new FileOutputStream( new File( getUnpackedPluginsDir(), GOALS_CACHE ) ), "goals cache" );
   
           getCallbackCache().store(
  -            new FileOutputStream( new File( getPluginsDir(), CALLBACKS_CACHE ) ), "callbacks cache" );
  +            new FileOutputStream( new File( getUnpackedPluginsDir(), CALLBACKS_CACHE ) ), "callbacks cache" );
   
           getDynaTagLibCache().store(
  -            new FileOutputStream( new File( getPluginsDir(), DYNAMIC_TAGLIBS_CACHE ) ), "taglibs cache" );
  +            new FileOutputStream( new File( getUnpackedPluginsDir(), DYNAMIC_TAGLIBS_CACHE ) ), "taglibs cache" );
   
           getPluginDynaTagDepsCache().store(
  -            new FileOutputStream( new File( getPluginsDir(), PLUGIN_DYNATAG_DEPS_CACHE ) ), "plugin deps cache" );
  +            new FileOutputStream( new File( getUnpackedPluginsDir(), PLUGIN_DYNATAG_DEPS_CACHE ) ), "plugin deps cache" );
       }
   
       /**
  @@ -389,7 +394,7 @@
   
           try
           {
  -            pluginCache.load( new FileInputStream( new File( getPluginsDir(), PLUGINS_CACHE ) ) );
  +            pluginCache.load( new FileInputStream( new File( getUnpackedPluginsDir(), PLUGINS_CACHE ) ) );
           }
           catch ( IOException e )
           {
  @@ -400,7 +405,7 @@
   
           try
           {
  -            goalCache.load( new FileInputStream( new File( getPluginsDir(), GOALS_CACHE ) ) );
  +            goalCache.load( new FileInputStream( new File( getUnpackedPluginsDir(), GOALS_CACHE ) ) );
           }
           catch ( IOException e )
           {
  @@ -411,7 +416,7 @@
   
           try
           {
  -            callbackCache.load( new FileInputStream( new File( getPluginsDir(), CALLBACKS_CACHE ) ) );
  +            callbackCache.load( new FileInputStream( new File( getUnpackedPluginsDir(), CALLBACKS_CACHE ) ) );
           }
           catch ( IOException e )
           {
  @@ -422,7 +427,7 @@
   
           try
           {
  -            dynaTagLibCache.load( new FileInputStream( new File( getPluginsDir(), DYNAMIC_TAGLIBS_CACHE ) ) );
  +            dynaTagLibCache.load( new FileInputStream( new File( getUnpackedPluginsDir(), DYNAMIC_TAGLIBS_CACHE ) ) );
           }
           catch ( IOException e )
           {
  @@ -433,7 +438,7 @@
   
           try
           {
  -            pluginDynaTagDepsCache.load( new FileInputStream( new File( getPluginsDir(), PLUGIN_DYNATAG_DEPS_CACHE ) ) );
  +            pluginDynaTagDepsCache.load( new FileInputStream( new File( getUnpackedPluginsDir(), PLUGIN_DYNATAG_DEPS_CACHE ) ) );
           }
           catch ( IOException e )
           {
  
  
  
  1.45      +108 -46   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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- PluginManager.java	9 Apr 2003 08:15:06 -0000	1.44
  +++ PluginManager.java	4 May 2003 23:39:03 -0000	1.45
  @@ -146,9 +146,12 @@
        */
       private static final String GLOBAL_SESSION_KEY = "maven.session.global";
   
  -    /** ${maven.home}/bin/plugins directory. */
  +    /** The directory where plugin jars reside under Maven's home. */
       private File pluginsDir;
   
  +    /** The directory where the plugin jars are unpacked to. */
  +    private File unpackedPluginsDir;
  +
       /**
        * This contains a set of sets where each set contains a list of
        * plugins that have been loaded for a particular project.
  @@ -166,7 +169,6 @@
   
       /** Cache manager for user jelly scripts. */
       private PluginCacheManager transientCacheManager;
  -    ;
   
       /**
        *  Default constructor.
  @@ -236,16 +238,33 @@
               return;
           }
   
  -        log.info( "Initializing Plugins!" );
  -
  +        if( log.isInfoEnabled() )
  +        {
  +           log.info( "Initializing Plugins!" );
  +        }
           setPluginsDir( new File( mavenSession.getRootContext().getMavenHome(), "plugins" ) );
  -
  -        cacheManager.setPluginsDir( getPluginsDir() );
  +        setUnpackedPluginsDir( new File( mavenSession.getRootContext().getUnpackedPluginsDir() ) );
  +        cacheManager.setUnpackedPluginsDir( getUnpackedPluginsDir() );
  +        if( log.isDebugEnabled() )
  +        {
  +            log.debug( "Set plugin source directory to "
  +                + getPluginsDir().getAbsolutePath() );
  +            log.debug( "Set plugin cache directory to "
  +                + getUnpackedPluginsDir().getAbsolutePath() );
  +        }
           cacheManager.loadCache();
   
           File[] files = getPluginsDir().listFiles();
  +        if( log.isInfoEnabled() )
  +        {
  +            log.info( "Unpacking plugins from directory --> "
  +                + getPluginsDir().getAbsolutePath() );
  +        }
   
  -        // First we expand any JARs that contain plugins.
  +        // First we expand any JARs that contain plugins to the unpack directory.
  +        // This will be a different directory than the plugin jars
  +        // MAVEN_HOME_LOCAL / maven.home.local was set to a different directory
  +        // than MAVEN_HOME / maven.home.
           for ( int i = 0; i < files.length; ++i )
           {
               // Only unpack the JAR if it hasn't been already, or is newer
  @@ -254,12 +273,18 @@
               {
                   String directory = files[i].getName();
                   directory = directory.substring( 0, directory.indexOf( ".jar" ) );
  -                File unzipDir = new File( getPluginsDir(), directory );
  +                File unzipDir = new File( getUnpackedPluginsDir(), directory );
   
                   // if there's no directory, or the jar is newer, expand the jar
                   if (   unzipDir.exists() == false
                       || files[i].lastModified() > unzipDir.lastModified() )
                   {
  +                    if( log.isDebugEnabled() )
  +                    {
  +                        log.debug( "Unpacking '" + directory
  +                            + "' plugin to directory --> "
  +                            + unzipDir.getAbsolutePath() );
  +                    }
                       invalidateCache( directory );
   
                       File processed = getPluginProcessedMarker( unzipDir.getName() );
  @@ -285,8 +310,14 @@
   
           // We need to get the directory listing again so that we
           // can process plugins that were just unpacked by the
  -        // above process.
  -        files = pluginsDir.listFiles();
  +        // above process. This time we're looking at the unpacked plugins.
  +        files = getUnpackedPluginsDir().listFiles();
  +
  +        if( log.isInfoEnabled() )
  +        {
  +            log.info( "Processing unpacked plugins in "
  +                + getUnpackedPluginsDir().getAbsolutePath() );
  +        }
   
           // Process each of the directorties.
           for ( int i = 0; i < files.length; ++i )
  @@ -363,12 +394,12 @@
           {
               if (project.getContext().getWerkzProject() == null)
               {
  -                throw new NoGoalException("No goal specified and no project.xml found.");    
  -            } 
  -            else 
  +                throw new NoGoalException("No goal specified and no project.xml found.");
  +            }
  +            else
               {
                   String defaultGoalName = project.getContext().getWerkzProject().getDefaultGoalName();
  -    
  +
                   if ( defaultGoalName != null )
                   {
                       project.getGoalNames().add( defaultGoalName );
  @@ -650,48 +681,58 @@
               return;
           }
   
  -        // We need to make sure all the dyna tag libs are initialized for this plugin.
  +        // We need to make sure all the dyna tag libs are initialized for this
  +        // plugin.
           prepDynaTagLibs( name, project );
   
  -        File pluginDir = getPluginDir( name );
  +        File unpackedPluginDir = getUnpackedPluginDir( name );
   
           // Use classworlds
  -        Forehead.getInstance().getClassLoader( "root.maven" ).addURL( pluginDir.toURL() );
  +        Forehead.getInstance().getClassLoader( "root.maven" )
  +            .addURL( unpackedPluginDir.toURL() );
   
  -        Project pluginProject = MavenUtils.getProject( new File( pluginDir, "project.xml" ),
  -                                                       project.getContext(),
  -                                                       false );
  +        Project pluginProject =
  +            MavenUtils.getProject( new File( unpackedPluginDir,
  +                                    "project.xml" ),
  +                                    project.getContext(),
  +                                    false );
   
           if ( isPluginProcessed( name ) == false )
           {
               pluginProject.verifyDependencies();
   
               // Mark the plugin as processed.
  -            FileUtils.fileWrite( getPluginProcessedMarker( name ).getPath(), "plugin has been processed.");
  +            FileUtils.fileWrite( getPluginProcessedMarker( name ).getPath(),
  +                                 "plugin has been processed.");
           }
   
           pluginProject.processDependencies();
   
  -        // We need to create a separate context for the plugin.jelly script to run against
  -        // because we need our values of "plugin" and "plugin.dir" to have distinct values.
  -        // Everything else can be taken from the project's context. We also want project
  -        // properties to override any default plugin properties. When we make the
  -        // pluginContext, context inheritance is on so when we integrate the plugin
  -        // properties if the project has already defined an overriding value it
  -        // won't get clobbered. The plugin defaults will only be used if the
  +        // We need to create a separate context for the plugin.jelly script to
  +        // run against because we need our values of "plugin" and "plugin.dir"
  +        // to have distinct values. Everything else can be taken from the
  +        // project's context. We also want project properties to override any
  +        // default plugin properties. When we make the pluginContext, context
  +        // inheritance is on so when we integrate the plugin properties if the
  +        // project has already defined an overriding value it won't get
  +        // clobbered. The plugin defaults will only be used if the
           // project hasn't provided a value.
  -        MavenJellyContext pluginContext = new MavenJellyContext( project.getContext() );
  -        MavenUtils.integrateMapInContext( getPluginProperties( pluginDir ), pluginContext );
  +        MavenJellyContext pluginContext =
  +            new MavenJellyContext( project.getContext() );
  +        MavenUtils.integrateMapInContext(
  +                        getPluginProperties( unpackedPluginDir ),
  +                        pluginContext );
           pluginContext.setVariable( "plugin", pluginProject );
  -        pluginContext.setVariable( "plugin.dir", pluginDir );
  +        pluginContext.setVariable( "plugin.dir", unpackedPluginDir );
   
           // Set a context variable that points to the plugin resources directory
  -        pluginContext.setVariable( "plugin.resources", new File( pluginDir, "plugin-resources" ) );
  +        pluginContext.setVariable( "plugin.resources",
  +            new File( unpackedPluginDir, "plugin-resources" ) );
   
           project.addPluginContext( pluginProject.getId(), pluginContext );
   
           JellyUtils.runScript( pluginScript,
  -                              getPluginDir( name ).toURL(),
  +                              unpackedPluginDir.toURL(),
                                 pluginContext,
                                 pluginContext.getXMLOutput() );
   
  @@ -827,7 +868,8 @@
        */
       File getPluginProcessedMarker( String pluginName )
       {
  -        return new File( new File( getPluginsDir(), pluginName ), ".processed" );
  +        return new File( new File( getUnpackedPluginsDir(), pluginName ),
  +                            ".processed" );
       }
   
       /**
  @@ -858,7 +900,7 @@
       /**
        *  Retrieve the plugin's default properties.
        *
  -     *  @param pluginDir The name of the plugin.
  +     *  @param unpackedPluginDir The location of the unpacked plugin.
        *
        *  @return The default properties file for the plugin, or <code>null</code>
        *          if no such plugin.
  @@ -866,10 +908,10 @@
        *  @throws IOException If an IO error occurs while attempting to read the
        *       plugin's properties.
        */
  -    Properties getPluginProperties( File pluginDir )
  +    Properties getPluginProperties( File unpackedPluginDir )
           throws IOException
       {
  -        File propsFile = new File( pluginDir, PLUGIN_PROPERTIES_NAME );
  +        File propsFile = new File( unpackedPluginDir, PLUGIN_PROPERTIES_NAME );
   
           if ( propsFile.exists() == false )
           {
  @@ -889,16 +931,15 @@
   
   
       /**
  -     *  Retrieve the directory for the specified plugin.
  +     *  Retrieve the directory where the specified plugin is unpacked.
        *
        *  @param pluginName The name of the plugin.
        *
  -     *  @return The directory for the plugin, or <code>null</code> if no such
  -     *          plugin.
  +     *  @return The directory where the specified plugin is unpacked.
        */
  -    File getPluginDir( String pluginName )
  +    File getUnpackedPluginDir( String pluginName )
       {
  -        return new File( getPluginsDir(), pluginName );
  +        return new File( getUnpackedPluginsDir(), pluginName );
       }
   
       /**
  @@ -906,12 +947,13 @@
        *
        *  @param pluginName The name of the plugin.
        *
  -     *  @return The entry-point script for the plugin, or <code>null</code> if no
  -     *          such plugin.
  +     *  @return The entry-point script for the plugin, or <code>null</code> if
  +     *          no such plugin.
        */
       File getPluginScript( String pluginName )
       {
  -        return new File( getPluginDir( pluginName ), PLUGIN_SCRIPT_NAME );
  +        return new File( getUnpackedPluginDir( pluginName ),
  +            PLUGIN_SCRIPT_NAME );
       }
   
       /**
  @@ -932,5 +974,25 @@
       File getPluginsDir()
       {
           return pluginsDir;
  +    }
  +
  +    /**
  +     *  Sets the directory where the unpacked plugins are located.
  +     *
  +     *  @param unpackedPluginsDir The directory where the unpacked plugins are located.
  +     */
  +    void setUnpackedPluginsDir( File unpackedPluginsDir )
  +    {
  +        this.unpackedPluginsDir = unpackedPluginsDir;
  +    }
  +
  +    /**
  +     *  Sets the directory where the unpacked plugins are located.
  +     *
  +     *  @return the directory where the unpacked plugins are located.
  +     */
  +    File getUnpackedPluginsDir()
  +    {
  +        return unpackedPluginsDir;
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: cvs commit: maven/src/java/org/apache/maven/plugin DefaultPluginManager.java PluginCacheManager.java PluginManager.java

Posted by di...@multitask.com.au.
works for me.
--
dIon Gillard, Multitask Consulting
Blog:      http://www.freeroller.net/page/dion/Weblog
Work:      http://www.multitask.com.au


Peter Lynch <pe...@mindspring.com> wrote on 05/05/2003 04:50:55 PM:

> dIon,
> 
> dion@multitask.com.au wrote:
> > Cool....one little comment below...
> > 
> > plynch@apache.org wrote on 05/05/2003 09:39:03 AM:
> > 
> > 
> >>  Log:
> >>  Applying MAVEN-302 from Aslak Hellesoy <as...@netcom.no> 
> >>with the following modifications:
> >>
> >>  o as I couldn't get the the users home dir in a batch file on 
> >>windows, I instead set the default maven.home.local property in 
> >>driver.properties
> > 
> > 
> > Isn't this %USERPROFILE% on windows???
> 
> Yes. Thanks for the info...honestly I didn't look too hard for it....but 

> if you don't see a problem with it, I'd rather leave it up to Java to 
> determine the user's home. Shouldn't be a problem if Java ever gets it 
> wrong as it is just a default that can be overriden.
> 
> Thanks,
> 
> -Peter
> 
> > 
> > --
> > dIon Gillard, Multitask Consulting
> > Blog:      http://www.freeroller.net/page/dion/Weblog
> > Work:      http://www.multitask.com.au
> > 
> > 
> > 
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> > 
> > 
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: cvs commit: maven/src/java/org/apache/maven/plugin DefaultPluginManager.java PluginCacheManager.java PluginManager.java

Posted by di...@multitask.com.au.
Works for me...
--
dIon Gillard, Multitask Consulting
Blog:      http://www.freeroller.net/page/dion/Weblog
Work:      http://www.multitask.com.au


Peter Lynch <pe...@mindspring.com> wrote on 05/05/2003 04:50:55 PM:

> dIon,
> 
> dion@multitask.com.au wrote:
> > Cool....one little comment below...
> > 
> > plynch@apache.org wrote on 05/05/2003 09:39:03 AM:
> > 
> > 
> >>  Log:
> >>  Applying MAVEN-302 from Aslak Hellesoy <as...@netcom.no> 
> >>with the following modifications:
> >>
> >>  o as I couldn't get the the users home dir in a batch file on 
> >>windows, I instead set the default maven.home.local property in 
> >>driver.properties
> > 
> > 
> > Isn't this %USERPROFILE% on windows???
> 
> Yes. Thanks for the info...honestly I didn't look too hard for it....but 

> if you don't see a problem with it, I'd rather leave it up to Java to 
> determine the user's home. Shouldn't be a problem if Java ever gets it 
> wrong as it is just a default that can be overriden.
> 
> Thanks,
> 
> -Peter
> 
> > 
> > --
> > dIon Gillard, Multitask Consulting
> > Blog:      http://www.freeroller.net/page/dion/Weblog
> > Work:      http://www.multitask.com.au
> > 
> > 
> > 
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> > 
> > 
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: cvs commit: maven/src/java/org/apache/maven/plugin DefaultPluginManager.java PluginCacheManager.java PluginManager.java

Posted by Peter Lynch <pe...@mindspring.com>.
dIon,

dion@multitask.com.au wrote:
> Cool....one little comment below...
> 
> plynch@apache.org wrote on 05/05/2003 09:39:03 AM:
> 
> 
>>  Log:
>>  Applying MAVEN-302 from Aslak Hellesoy <as...@netcom.no> 
>>with the following modifications:
>>
>>  o as I couldn't get the the users home dir in a batch file on 
>>windows, I instead set the default maven.home.local property in 
>>driver.properties
> 
> 
> Isn't this %USERPROFILE% on windows???

Yes. Thanks for the info...honestly I didn't look too hard for it....but 
if you don't see a problem with it, I'd rather leave it up to Java to 
determine the user's home. Shouldn't be a problem if Java ever gets it 
wrong as it is just a default that can be overriden.

Thanks,

-Peter

> 
> --
> dIon Gillard, Multitask Consulting
> Blog:      http://www.freeroller.net/page/dion/Weblog
> Work:      http://www.multitask.com.au
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
> 
> 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: cvs commit: maven/src/java/org/apache/maven/plugin DefaultPluginManager.java PluginCacheManager.java PluginManager.java

Posted by di...@multitask.com.au.
Cool....one little comment below...

plynch@apache.org wrote on 05/05/2003 09:39:03 AM:

>   Log:
>   Applying MAVEN-302 from Aslak Hellesoy <as...@netcom.no> 
> with the following modifications:
> 
>   o as I couldn't get the the users home dir in a batch file on 
> windows, I instead set the default maven.home.local property in 
> driver.properties

Isn't this %USERPROFILE% on windows???

--
dIon Gillard, Multitask Consulting
Blog:      http://www.freeroller.net/page/dion/Weblog
Work:      http://www.multitask.com.au



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org