remm 2004/09/02 03:28:00 Modified: catalina/src/share/org/apache/catalina/startup HostConfig.java Constants.java Log: - Put context.xml filename in the constants list. Revision Changes Path 1.45 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java Index: HostConfig.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- HostConfig.java 2 Sep 2004 10:15:53 -0000 1.44 +++ HostConfig.java 2 Sep 2004 10:28:00 -0000 1.45 @@ -694,7 +694,7 @@ if (deployXML && !xml.exists()) { try { jar = new JarFile(dir); - entry = jar.getJarEntry("META-INF/context.xml"); + entry = jar.getJarEntry(Constants.ApplicationContextXml); if (entry != null) { istream = jar.getInputStream(entry); @@ -877,7 +877,7 @@ context.setDocBase(file); if (deployXML) { context.setConfigFile - ((new File(dir, "META-INF/context.xml")).getAbsolutePath()); + ((new File(dir, Constants.ApplicationContextXml)).getAbsolutePath()); } host.addChild(context); deployedApp.redeployResources.put(dir.getAbsolutePath(), 1.9 +2 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Constants.java Index: Constants.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Constants.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Constants.java 1 Sep 2004 22:55:48 -0000 1.8 +++ Constants.java 2 Sep 2004 10:28:00 -0000 1.9 @@ -30,6 +30,7 @@ public static final String Package = "org.apache.catalina.startup"; + public static final String ApplicationContextXml = "META-INF/context.xml"; public static final String ApplicationWebXml = "/WEB-INF/web.xml"; public static final String DefaultContextXml = "conf/context.xml"; public static final String DefaultWebXml = "conf/web.xml";
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]