donaldp     02/05/15 05:16:51

  Modified:    src/java/org/apache/avalon/phoenix/components/deployer/installer
                        Installer.java
  Log:
  Make sure that the work directory uses name of application not name of 
sarfile.
  
  Thanks Ulrich for pointing this out ;)
  
  Revision  Changes    Path
  1.5       +6 -6      
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installer.java
  
  Index: Installer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Installer.java    15 May 2002 10:54:49 -0000      1.4
  +++ Installer.java    15 May 2002 12:16:51 -0000      1.5
  @@ -34,7 +34,7 @@
    * and installing it as appropriate.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
  - * @version $Revision: 1.4 $ $Date: 2002/05/15 10:54:49 $
  + * @version $Revision: 1.5 $ $Date: 2002/05/15 12:16:51 $
    */
   public class Installer
       extends AbstractLogEnabled
  @@ -320,7 +320,7 @@
           final ArrayList jars = new ArrayList();
   
           final File workDir =
  -            getRelativeWorkDir( m_baseWorkDirectory, file );
  +            getRelativeWorkDir( m_baseWorkDirectory, name );
   
           expandZipFile( zipFile, directory, workDir, jars, digests, url );
   
  @@ -533,17 +533,17 @@
   
       /**
        * Create working directory inside baseWorkDir
  -     * for specified file.
  +     * for specified application.
        *
        * @param baseWorkDir the base workDir for all apps
  -     * @param file the file representing app
  +     * @param name the name of the application
        * @return the working directory for app
        */
       private File getRelativeWorkDir( final File baseWorkDir,
  -                                     final File file )
  +                                     final String name )
       {
           final String filename =
  -            file.getName() + "-" + System.currentTimeMillis();
  +            name + "-" + System.currentTimeMillis();
           return new File( baseWorkDir, filename );
       }
   
  
  
  

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

Reply via email to