Attachment 15163 Details for Bug 35054 – HostConfig.java.patch2

[patch] HostConfig.java.patch2

HostConfig.java.patch2 (text/plain), 1.54 KB, created by Ralf Hauser on 2005-05-25 11:30:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Hauser

Created: 2005-05-25 11:30:45 UTC

Size: 1.54 KB

patch

obsolete

>--- HostConfig.java	2005-05-25 11:26:01.803854400 +0200
>+++ HostConfig.java.orig	2005-05-25 09:41:00.242654400 +0200
>@@ -384,34 +384,14 @@
>         }
> 
>         File file = new File(host.getAppBase());
>-        boolean makeRelative = false;
>-        if (!file.isAbsolute()) {
>-            makeRelative = true;
>+        if (!file.isAbsolute())
>             file = new File(System.getProperty("catalina.base"),
>-                            host.getAppBase());}
>+                            host.getAppBase());
>         try {
>             appBase = file.getCanonicalFile();
>         } catch (IOException e) {
>             appBase = file;
>         }
>-        if (log.isInfoEnabled()) {
>-            if (!appBase.exists()) {
>-                String extraInfo = "";
>-                if (makeRelative) {
>-                    extraInfo = " neither absolute, nor in \"" +file.getAbsolutePath() + "\"";
>-                }
>-                log.info("no app-base of host \"" + host.getName() + 
>-                		"\" exists for declared \""
>-                        + host.getAppBase() + "\"" +extraInfo
>-                        		);
>-            } else {
>-            if (!appBase.isDirectory()) {
>-                log.info("app-base for host \"" + host.getName() + 
>-                		"\" must be a directory \""
>-                        + host.getAppBase() + "\"; WAR files go into the \"Context\"'s \"docBase\" atrribute.");
>-                //see http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/host.html#Attributes
>-            }}
>-        } 
>         return (appBase);
> 
>     }

Actions: View | Diff

Attachments on bug 35054: 15162 | 15163 | 15742