You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/09/15 04:41:47 UTC

cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer Installation.java Installer.java

donaldp     2002/09/14 19:41:47

  Modified:    src/java/org/apache/avalon/phoenix/components/deployer/installer
                        Installation.java Installer.java
  Log:
  remove the notion of timestamps from applications.
  
  Revision  Changes    Path
  1.4       +2 -16     jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installation.java
  
  Index: Installation.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installation.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Installation.java	15 Sep 2002 02:38:25 -0000	1.3
  +++ Installation.java	15 Sep 2002 02:41:47 -0000	1.4
  @@ -41,17 +41,13 @@
       ///ClassPath for application
       private final String[] m_classPath;
   
  -    ///Installation timestamp
  -    private final long m_timestamp;
  -
       public Installation( final File source,
                            final File directory,
                            final File workDirectory,
                            final String config,
                            final String assembly,
                            final String environment,
  -                         final String[] classPath,
  -                         final long timestamp )
  +                         final String[] classPath )
       {
           m_source = source;
           m_directory = directory;
  @@ -60,7 +56,6 @@
           m_assembly = assembly;
           m_environment = environment;
           m_classPath = classPath;
  -        m_timestamp = timestamp;
       }
   
       /**
  @@ -133,14 +128,5 @@
       public String[] getClassPath()
       {
           return m_classPath;
  -    }
  -
  -    /** Retrieve the timestamp.
  -     *
  -     * @return the timestamp when installation occured.
  -     */
  -    public long getTimestamp()
  -    {
  -        return m_timestamp;
       }
   }
  
  
  
  1.16      +3 -9      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Installer.java	15 Sep 2002 02:39:42 -0000	1.15
  +++ Installer.java	15 Sep 2002 02:41:47 -0000	1.16
  @@ -205,24 +205,18 @@
           try
           {
               expandZipFile( zipFile, directory, workDir, jars, url );
  -
  -            //Retrieve name of environment file
  -            //need to check existence to support backwards compatability
  -            final File envFile = new File( directory, FS_ENV_XML );
  -
               //Prepare and create Installation
               final String[] classPath =
                   (String[])jars.toArray( new String[ jars.size() ] );
   
               final String assembly = getURLAsString( new File( directory, FS_ASSEMBLY_XML ) );
               final String config = getURLAsString( new File( directory, FS_CONFIG_XML ) );
  -            final String environment = getURLAsString( envFile );
  -            final long timestamp = System.currentTimeMillis();
  +            final String environment = getURLAsString( new File( directory, FS_ENV_XML ) );
   
               success = true;
               return new Installation( file, directory, workDir,
                                        config, assembly, environment,
  -                                     classPath, timestamp );
  +                                     classPath );
           }
           finally
           {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>