You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/09/10 01:29:27 UTC

svn commit: r1167396 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java java/org/apache/tomcat/util/digester/GenericParser.java java/org/apache/tomcat/util/digester/XercesParser.java webapps/docs/changelog.xml

Author: kkolinko
Date: Fri Sep  9 23:29:27 2011
New Revision: 1167396

URL: http://svn.apache.org/viewvc?rev=1167396&view=rev
Log:
Beckport r1167394 from trunk.
It is followup to r1164569, because not all occurences have been replaced.

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51758
Align the digester logger names with the class name else users will never be able to figure out how to stop it logging

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  9 23:29:27 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1167396&r1=1167395&r2=1167396&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri Sep  9 23:29:27 2011
@@ -102,7 +102,7 @@ public class Digester extends DefaultHan
                     initialized = true;
                 } catch (Throwable t) {
                     ExceptionUtils.handleThrowable(t);
-                    LogFactory.getLog("org.apache.commons.digester.Digester").
+                    LogFactory.getLog("org.apache.tomcat.util.digester.Digester").
                         error("Unable to load property source["+className+"].",t);
                 }
             }

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java?rev=1167396&r1=1167395&r2=1167396&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java Fri Sep  9 23:29:27 2011
@@ -41,7 +41,7 @@ public class GenericParser{
      * The Log to which all SAX event related logging calls will be made.
      */
     private static final Log log =
-        LogFactory.getLog("org.apache.commons.digester.Digester.sax");
+        LogFactory.getLog("org.apache.tomcat.util.digester.Digester.sax");
 
     /**
      * The JAXP 1.2 property required to set up the schema location.

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java?rev=1167396&r1=1167395&r2=1167396&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java Fri Sep  9 23:29:27 2011
@@ -46,7 +46,7 @@ public class XercesParser{
      * The Log to which all SAX event related logging calls will be made.
      */
     private static final Log log =
-        LogFactory.getLog("org.apache.commons.digester.Digester.sax");
+        LogFactory.getLog("org.apache.tomcat.util.digester.Digester.sax");
 
 
     /**

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1167396&r1=1167395&r2=1167396&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Sep  9 23:29:27 2011
@@ -81,7 +81,8 @@
         <bug>51758</bug>: The digester (used for processing XML files) used the
         logger name <code>org.apache.commons.digester.Digester</code> rather
         than the expected <code>org.apache.tomcat.util.digester.Digester</code>.
-        The digester has been changed to use the expected logger name. (markt)
+        The digester has been changed to use the expected logger name.
+        (markt/kkolinko)
       </fix>
       <fix>
         <bug>51774</bug>: Fix incorrect cached method signature that prevented



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org