remm 2004/10/02 02:22:59
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Remove dead code.
Revision Changes Path
1.151 +1 -44
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- StandardContext.java 2 Oct 2004 09:22:18 -0000 1.150
+++ StandardContext.java 2 Oct 2004 09:22:59 -0000 1.151
@@ -3878,49 +3878,6 @@
setConfigured(false);
boolean ok = true;
- // Set config file name
- /*
- File configBase = getConfigBase();
- if ((configBase != null) && saveConfig) {
- if (getConfigFile() == null) {
- File file = new File(configBase, getDefaultConfigFile());
- setConfigFile(file.getPath());
- // If the docbase is outside the appBase, we should save our
- // config
- try {
- File appBaseFile = new File(getAppBase());
- if (!appBaseFile.isAbsolute()) {
- appBaseFile = new File(engineBase(), getAppBase());
- }
- String appBase = appBaseFile.getCanonicalPath();
- String basePath =
- (new File(getBasePath())).getCanonicalPath();
- if (!basePath.startsWith(appBase)) {
- Server server = ServerFactory.getServer();
- ((StandardServer) server).storeContext(this);
- }
- } catch (Exception e) {
- log.warn("Error storing config file", e);
- }
- } else {
- try {
- String canConfigFile =
- (new File(getConfigFile())).getCanonicalPath();
- if (!canConfigFile.startsWith
- (configBase.getCanonicalPath())) {
- File file =
- new File(configBase, getDefaultConfigFile());
- if (copy(new File(canConfigFile), file)) {
- setConfigFile(file.getPath());
- }
- }
- } catch (Exception e) {
- log.warn("Error setting config file", e);
- }
- }
- }
- */
-
// Add missing components as necessary
if (webappResources == null) { // (1) Required by Loader
if (log.isDebugEnabled())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
