From: remm Date: Thu, 13 Jul 2006 14:00:17 +0000 (+0000) Subject: - Comment out storeconfig for now. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=2147b29e95ccedcebfbf6a3ce8032aa45eaf212c;p=tomcat7.0 - Comment out storeconfig for now. - Port patch. - Add logging.properties. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@421634 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/conf/logging.properties b/conf/logging.properties new file mode 100644 index 000000000..c00e5d375 --- /dev/null +++ b/conf/logging.properties @@ -0,0 +1,56 @@ +handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.FileHandler.level = FINE +1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +1catalina.org.apache.juli.FileHandler.prefix = catalina. + +2localhost.org.apache.juli.FileHandler.level = FINE +2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +2localhost.org.apache.juli.FileHandler.prefix = localhost. + +3manager.org.apache.juli.FileHandler.level = FINE +3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +3manager.org.apache.juli.FileHandler.prefix = manager. + +4admin.org.apache.juli.FileHandler.level = FINE +4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +4admin.org.apache.juli.FileHandler.prefix = admin. + +5host-manager.org.apache.juli.FileHandler.level = FINE +5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +5host-manager.org.apache.juli.FileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = 4admin.org.apache.juli.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.apache.juli.FileHandler + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +#org.apache.catalina.startup.ContextConfig.level = FINE +#org.apache.catalina.startup.HostConfig.level = FINE +#org.apache.catalina.session.ManagerBase.level = FINE +#org.apache.catalina.core.AprLifecycleListener.level=FINE diff --git a/conf/server.xml b/conf/server.xml index c7eaf8b52..424bd780f 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -17,7 +17,7 @@ - + diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index b71fa12e9..151ca9e4b 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -261,7 +261,7 @@ public class StandardContext /** * The ServletContext implementation associated with this Context. */ - private transient ApplicationContext context = null; + protected transient ApplicationContext context = null; /** @@ -450,6 +450,12 @@ public class StandardContext /** + * The original document root for this web application. + */ + private String originalDocBase = null; + + + /** * The privileged flag for this web application. */ private boolean privileged = false; @@ -1494,6 +1500,28 @@ public class StandardContext /** + * Return the original document root for this Context. This can be an absolute + * pathname, a relative pathname, or a URL. + * Is only set as deployment has change docRoot! + */ + public String getOriginalDocBase() { + + return (this.originalDocBase); + + } + + /** + * Set the original document root for this Context. This can be an absolute + * pathname, a relative pathname, or a URL. + * + * @param docBase The orginal document root + */ + public void setOriginalDocBase(String docBase) { + + this.originalDocBase = docBase; + } + + /** * Return the privileged flag for this web application. */ public boolean getPrivileged() { @@ -4685,7 +4713,7 @@ public class StandardContext /** * Get base path. */ - private String getBasePath() { + protected String getBasePath() { String docBase = null; Container container = this; while (container != null) { @@ -4715,7 +4743,7 @@ public class StandardContext /** * Get app base. */ - private String getAppBase() { + protected String getAppBase() { String appBase = null; Container container = this; while (container != null) { diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml index bc0f6b966..0bbfee94e 100644 --- a/java/org/apache/catalina/core/mbeans-descriptors.xml +++ b/java/org/apache/catalina/core/mbeans-descriptors.xml @@ -133,6 +133,10 @@ description="Name of the object" type="java.lang.String"/> + + diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index c43fc89bf..0c71c2251 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -875,7 +875,8 @@ public class ContextConfig docBase = file.getCanonicalPath(); } file = new File(docBase); - + String origDocBase = docBase; + if (docBase.toLowerCase().endsWith(".war") && !file.isDirectory() && unpackWARs) { URL war = new URL("jar:" + (new File(docBase)).toURL() + "!/"); String contextPath = context.getPath(); @@ -885,6 +886,9 @@ public class ContextConfig docBase = ExpandWar.expand(host, war, contextPath); file = new File(docBase); docBase = file.getCanonicalPath(); + if (context instanceof StandardContext) { + ((StandardContext) context).setOriginalDocBase(origDocBase); + } } else { File docDir = new File(docBase); if (!docDir.exists()) { @@ -899,6 +903,9 @@ public class ContextConfig docBase = warFile.getCanonicalPath(); } } + if (context instanceof StandardContext) { + ((StandardContext) context).setOriginalDocBase(origDocBase); + } } }