Author: markt
Date: Mon Jul 20 10:40:29 2009
New Revision: 795749
URL: http://svn.apache.org/viewvc?rev=795749&view=rev
Log:
Improve JNDI debug logging for lookups.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/naming/SelectorContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 20 10:40:29 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794822,795043,795152,795457
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794822,795043,795152,795457
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=795749&r1=795748&r2=795749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 20 10:40:29 2009
@@ -144,11 +144,6 @@
+1: fhanik
-1:
-* Improve JNDI debug logging for lookups
- http://svn.apache.org/viewvc?rev=794082&view=rev
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47444
Remove Jakarta references
http://people.apache.org/~markt/patches/2009-07-16-jakarta-part1.patch
Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings.properties?rev=795749&r1=795748&r2=795749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings.properties
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings.properties Mon Jul
20 10:40:29 2009
@@ -17,6 +17,8 @@
contextBindings.noContextBoundToThread=No naming context bound to this thread
contextBindings.noContextBoundToCL=No naming context bound to this class loader
selectorContext.noJavaUrl=This context must be accessed throught a java: URL
+selectorContext.methodUsingName=Call to method ''{0}'' with a Name of ''{1}''
+selectorContext.methodUsingString=Call to method ''{0}'' with a String of
''{1}''
namingContext.contextExpected=Name is not bound to a Context
namingContext.failResolvingReference=Unexpected exception resolving reference
namingContext.nameNotBound=Name {0} is not bound in this Context
Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/SelectorContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/SelectorContext.java?rev=795749&r1=795748&r2=795749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/SelectorContext.java Mon Jul 20
10:40:29 2009
@@ -56,6 +56,9 @@
public static final String IC_PREFIX = "IC_";
+ private static org.apache.juli.logging.Log log =
+ org.apache.juli.logging.LogFactory.getLog(SelectorContext.class);
+
// ----------------------------------------------------------- Constructors
@@ -115,6 +118,12 @@
*/
public Object lookup(Name name)
throws NamingException {
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("selectorContext.methodUsingName", "lookup",
+ name));
+ }
+
// Strip the URL header
// Find the appropriate NamingContext according to the current bindings
// Execute the lookup on that context
@@ -131,6 +140,12 @@
*/
public Object lookup(String name)
throws NamingException {
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("selectorContext.methodUsingString",
"lookup",
+ name));
+ }
+
// Strip the URL header
// Find the appropriate NamingContext according to the current bindings
// Execute the lookup on that context
@@ -289,6 +304,12 @@
*/
public NamingEnumeration list(Name name)
throws NamingException {
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("selectorContext.methodUsingName", "list",
+ name));
+ }
+
return getBoundContext().list(parseName(name));
}
@@ -304,6 +325,12 @@
*/
public NamingEnumeration list(String name)
throws NamingException {
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("selectorContext.methodUsingString", "list",
+ name));
+ }
+
return getBoundContext().list(parseName(name));
}
@@ -323,6 +350,12 @@
*/
public NamingEnumeration listBindings(Name name)
throws NamingException {
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("selectorContext.methodUsingName",
+ "listBindings", name));
+ }
+
return getBoundContext().listBindings(parseName(name));
}
@@ -338,6 +371,12 @@
*/
public NamingEnumeration listBindings(String name)
throws NamingException {
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("selectorContext.methodUsingString",
+ "listBindings", name));
+ }
+
return getBoundContext().listBindings(parseName(name));
}
@@ -435,6 +474,12 @@
*/
public Object lookupLink(Name name)
throws NamingException {
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("selectorContext.methodUsingName",
+ "lookupLink", name));
+ }
+
return getBoundContext().lookupLink(parseName(name));
}
@@ -450,6 +495,12 @@
*/
public Object lookupLink(String name)
throws NamingException {
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("selectorContext.methodUsingString",
+ "lookupLink", name));
+ }
+
return getBoundContext().lookupLink(parseName(name));
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=795749&r1=795748&r2=795749&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jul 20 10:40:29 2009
@@ -144,6 +144,9 @@
<add>
Allow log file encoding to be configured for JULI FileHandler.
(kkolinko)
</add>
+ <add>
+ Provide debug logging for JNDI lookups. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
