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:[EMAIL PROTECTED]">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:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
