Author: remm
Date: Thu Jul 13 07:00:17 2006
New Revision: 421634
URL: http://svn.apache.org/viewvc?rev=421634&view=rev
Log:
- Comment out storeconfig for now.
- Port patch.
- Add logging.properties.
Added:
tomcat/tc6.0.x/trunk/conf/logging.properties (with props)
Modified:
tomcat/tc6.0.x/trunk/conf/server.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Added: tomcat/tc6.0.x/trunk/conf/logging.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/logging.properties?rev=421634&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/logging.properties (added)
+++ tomcat/tc6.0.x/trunk/conf/logging.properties Thu Jul 13 07:00:17 2006
@@ -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
Propchange: tomcat/tc6.0.x/trunk/conf/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc6.0.x/trunk/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/server.xml?rev=421634&r1=421633&r2=421634&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/server.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/server.xml Thu Jul 13 07:00:17 2006
@@ -17,7 +17,7 @@
<Listener className="org.apache.catalina.core.AprLifecycleListener" />
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
<Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <Listener
className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
+ <!--<Listener
className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>-->
<!-- Global JNDI resources -->
<GlobalNamingResources>
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=421634&r1=421633&r2=421634&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Jul 13 07:00:17 2006
@@ -261,7 +261,7 @@
/**
* The ServletContext implementation associated with this Context.
*/
- private transient ApplicationContext context = null;
+ protected transient ApplicationContext context = null;
/**
@@ -450,6 +450,12 @@
/**
+ * 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 @@
/**
+ * 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 @@
/**
* Get base path.
*/
- private String getBasePath() {
+ protected String getBasePath() {
String docBase = null;
Container container = this;
while (container != null) {
@@ -4715,7 +4743,7 @@
/**
* Get app base.
*/
- private String getAppBase() {
+ protected String getAppBase() {
String appBase = null;
Container container = this;
while (container != null) {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=421634&r1=421633&r2=421634&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Thu Jul 13 07:00:17 2006
@@ -133,6 +133,10 @@
description="Name of the object"
type="java.lang.String"/>
+ <attribute name="originalDocBase"
+ description="The original document root for this web
application"
+ type="java.lang.String"/>
+
<attribute name="override"
description="The DefaultContext override flag for this web
application"
type="boolean"/>
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=421634&r1=421633&r2=421634&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Thu Jul 13 07:00:17 2006
@@ -875,7 +875,8 @@
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 @@
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()) {
@@ -898,6 +902,9 @@
} else {
docBase = warFile.getCanonicalPath();
}
+ }
+ if (context instanceof StandardContext) {
+ ((StandardContext)
context).setOriginalDocBase(origDocBase);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
