Return-Path: 
 <avalon-cvs-return-6838-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 54834 invoked from network); 15 May 2002 12:27:42 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 15 May 2002 12:27:42 -0000
Received: (qmail 23478 invoked by uid 97); 15 May 2002 12:27:42 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 23461 invoked by uid 97); 15 May 2002 12:27:41 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 23450 invoked by uid 97); 15 May 2002 12:27:41 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 15 May 2002 12:27:38 -0000
Message-ID: <20020515122738.68035.qmail@icarus.apache.org>
From: donaldp@apache.org
To: jakarta-avalon-phoenix-cvs@apache.org
Subject: cvs commit:
 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer
 Installer.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

donaldp     02/05/15 05:27:38

  Modified:    src/java/org/apache/avalon/phoenix/components/deployer/installer
                        Installer.java
  Log:
  Remove Feature: Use old config file name server.xml
  Deprecated since: 2001/11/10
  
  SAR-INF/server.xml was renamed to SAR-INF/environment.xml because phoenix and
  this configuration was not specific to servers but to the environment in
  which the applicaiton executes.
  
  Revision  Changes    Path
  1.6       +2 -11     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Installer.java	15 May 2002 12:16:51 -0000	1.5
  +++ Installer.java	15 May 2002 12:27:38 -0000	1.6
  @@ -34,7 +34,7 @@
    * and installing it as appropriate.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.5 $ $Date: 2002/05/15 12:16:51 $
  + * @version $Revision: 1.6 $ $Date: 2002/05/15 12:27:38 $
    */
   public class Installer
       extends AbstractLogEnabled
  @@ -57,7 +57,6 @@
       //The names on the native filesystem
       private static final String FS_CONFIG_XML = "SAR-INF" + File.separator + "config.xml";
       private static final String FS_ASSEMBLY_XML = "SAR-INF" + File.separator + "assembly.xml";
  -    private static final String FS_SERVER_XML = "SAR-INF" + File.separator + "server.xml";
       private static final String FS_ENV_XML = "SAR-INF" + File.separator + "environment.xml";
       private static final String FS_CLASSES =
           "SAR-INF" + File.separator + "classes" + File.separator;
  @@ -326,15 +325,7 @@
   
           //Retrieve name of environment file
           //need to check existence to support backwards compatability
  -        File envFile = new File( directory, FS_ENV_XML );
  -        if( !envFile.exists() )
  -        {
  -            final String message =
  -                REZ.getString( "deprecated-environment-xml", url );
  -            System.err.println( message );
  -            getLogger().warn( message );
  -            envFile = new File( directory, FS_SERVER_XML );
  -        }
  +        final File envFile = new File( directory, FS_ENV_XML );
   
           //Prepare and create Installation
           final String[] classPath =
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>