jvanzyl     2002/07/16 20:19:56

  Modified:    src/java/org/apache/maven/app PluginManager.java
  Log:
  o Correct the logic for unzipping the plugin jars.
  
  Revision  Changes    Path
  1.16      +10 -5     
jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java
  
  Index: PluginManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PluginManager.java        17 Jul 2002 02:54:12 -0000      1.15
  +++ PluginManager.java        17 Jul 2002 03:19:56 -0000      1.16
  @@ -175,16 +175,21 @@
           // First we expand any JARs that contain plugins.
           for (int i = 0; i < files.length; ++i)
           {
  +            
               // Only unpack the JAR if it hasn't been already.
  -            if (files[i].getName().endsWith(".jar") && 
!getPluginDir(files[i].getName()).exists())
  +            if (files[i].getName().endsWith(".jar"))
               {
  -                Expand unzipper = new Expand();
  -                unzipper.setSrc(files[i]);
                   String directory = files[i].getName();
                   directory = directory.substring(0, directory.indexOf(".jar"));
                   File unzipDir = new File(getPluginsDir(), directory);
  -                unzipper.setDest(unzipDir);
  -                unzipper.execute();
  +                
  +                if (!unzipDir.exists())
  +                {
  +                    Expand unzipper = new Expand();
  +                    unzipper.setSrc(files[i]);
  +                    unzipper.setDest(unzipDir);
  +                    unzipper.execute();
  +                }                    
               }
           }
           
  
  
  

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

Reply via email to