Author: schultz Date: Tue Sep 17 14:52:28 2013 New Revision: 1524078 URL: http://svn.apache.org/r1524078 Log: Fix code style. Add stderr log source (class/method). Add catalina.policy entry for new system property.
Modified: tomcat/trunk/conf/catalina.policy tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Modified: tomcat/trunk/conf/catalina.policy URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=1524078&r1=1524077&r2=1524078&view=diff ============================================================================== --- tomcat/trunk/conf/catalina.policy (original) +++ tomcat/trunk/conf/catalina.policy Tue Sep 17 14:52:28 2013 @@ -89,6 +89,7 @@ grant codeBase "file:${catalina.home}/bi permission java.util.PropertyPermission "org.apache.juli.AsyncLoggerPollInterval", "read"; permission java.util.PropertyPermission "org.apache.juli.AsyncMaxRecordCount", "read"; permission java.util.PropertyPermission "org.apache.juli.AsyncOverflowDropType", "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/trunk/java/org/apache/juli/ClassLoaderLogManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1524078&r1=1524077&r2=1524078&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original) +++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue Sep 17 14:52:28 2013 @@ -420,21 +420,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: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org