Author: schultz
Date: Tue Sep 17 14:55:01 2013
New Revision: 1524081
URL: http://svn.apache.org/r1524081
Log:
Fix code style.
Add stderr log source (class/method).
Add catalina.policy entry for new system property.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/conf/catalina.policy
tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1524078
Modified: tomcat/tc7.0.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/catalina.policy?rev=1524081&r1=1524080&r2=1524081&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc7.0.x/trunk/conf/catalina.policy Tue Sep 17 14:55:01 2013
@@ -84,6 +84,7 @@ grant codeBase "file:${catalina.home}/bi
permission java.util.PropertyPermission
"java.util.logging.config.class", "read";
permission java.util.PropertyPermission
"java.util.logging.config.file", "read";
+ permission java.util.PropertyPermission
"org.apache.juli.ClassLoaderLogManager.debug", "read";
permission java.util.PropertyPermission "catalina.base", "read";
// Note: To enable per context logging configuration, permit read
access to
Modified: tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1524081&r1=1524080&r2=1524081&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue
Sep 17 14:55:01 2013
@@ -421,21 +421,22 @@ public class ClassLoaderLogManager exten
// Special case for URL classloaders which are used in containers:
// only look in the local repositories to avoid redefining loggers 20
times
try {
- if (classLoader instanceof URLClassLoader)
- {
+ if (classLoader instanceof URLClassLoader) {
URL logConfig =
((URLClassLoader)classLoader).findResource("logging.properties");
- if(null != logConfig)
- {
+ if(null != logConfig) {
if(Boolean.getBoolean(DEBUG_PROPERTY))
- System.err.println("Found logging.properties at " +
logConfig);
+ System.err.println(getClass().getName()
+ + ".readConfiguration(): "
+ + "Found logging.properties at "
+ + logConfig);
is = classLoader.getResourceAsStream("logging.properties");
- }
- else
- {
+ } else {
if(Boolean.getBoolean(DEBUG_PROPERTY))
- System.err.println("Found no logging.properties");
+ System.err.println(getClass().getName()
+ + ".readConfiguration(): "
+ + "Found no logging.properties");
}
}
} catch (AccessControlException ace) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
