You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/05/11 09:22:34 UTC
svn commit: r1101774 -
/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/
Author: simonetripodi
Date: Wed May 11 07:22:33 2011
New Revision: 1101774
URL: http://svn.apache.org/viewvc?rev=1101774&view=rev
Log:
Digester loggers can be private and accessed via related getters
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java Wed May 11 07:22:33 2011
@@ -102,8 +102,8 @@ public class BeanPropertySetterRule exte
throws Exception {
// log some debugging information
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[BeanPropertySetterRule]{" +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[BeanPropertySetterRule]{" +
getDigester().match + "} Called with text '" + text + "'");
}
@@ -139,8 +139,8 @@ public class BeanPropertySetterRule exte
Object top = getDigester().peek();
// log some debugging information
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[BeanPropertySetterRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[BeanPropertySetterRule]{" + getDigester().match +
"} Set " + top.getClass().getName() + " property " +
property + " with text " + bodyText);
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java Wed May 11 07:22:33 2011
@@ -439,9 +439,9 @@ public class CallMethodRule extends Rule
parameters = (Object[]) getDigester().popParams();
- if (getDigester().log.isTraceEnabled()) {
+ if (getDigester().getLogger().isTraceEnabled()) {
for (int i=0,size=parameters.length;i<size;i++) {
- getDigester().log.trace("[CallMethodRule](" + i + ")" + parameters[i]) ;
+ getDigester().getLogger().trace("[CallMethodRule](" + i + ")" + parameters[i]) ;
}
}
@@ -524,7 +524,7 @@ public class CallMethodRule extends Rule
}
// Invoke the required method on the top object
- if (getDigester().log.isDebugEnabled()) {
+ if (getDigester().getLogger().isDebugEnabled()) {
StringBuffer sb = new StringBuffer("[CallMethodRule]{");
sb.append(getDigester().match);
sb.append("} Call ");
@@ -549,7 +549,7 @@ public class CallMethodRule extends Rule
}
}
sb.append(")");
- getDigester().log.debug(sb.toString());
+ getDigester().getLogger().debug(sb.toString());
}
Object result = null;
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java Wed May 11 07:22:33 2011
@@ -162,13 +162,13 @@ public class CallParamRule extends Rule
param = getDigester().peek(stackIndex);
- if (getDigester().log.isDebugEnabled()) {
+ if (getDigester().getLogger().isDebugEnabled()) {
StringBuffer sb = new StringBuffer("[CallParamRule]{");
sb.append(getDigester().match);
sb.append("} Save from stack; from stack?").append(fromStack);
sb.append("; object=").append(param);
- getDigester().log.debug(sb.toString());
+ getDigester().getLogger().debug(sb.toString());
}
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java Wed May 11 07:22:33 2011
@@ -312,14 +312,14 @@ public class Digester extends DefaultHan
/**
* The Log to which most logging calls will be made.
*/
- protected Log log =
+ private Log log =
LogFactory.getLog("org.apache.commons.digester3.Digester");
/**
* The Log to which all SAX event related logging calls will be made.
*/
- protected Log saxLog =
+ private Log saxLog =
LogFactory.getLog("org.apache.commons.digester3.Digester.sax");
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java Wed May 11 07:22:33 2011
@@ -270,8 +270,8 @@ public class FactoryCreateRule extends R
try {
Object instance = getFactory(attributes).createObject(attributes);
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[FactoryCreateRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().match +
"} New " + (instance == null ? "null object" :
instance.getClass().getName()));
}
@@ -280,11 +280,11 @@ public class FactoryCreateRule extends R
} catch (Exception e) {
// log message and error
- if (getDigester().log.isInfoEnabled()) {
- getDigester().log.info("[FactoryCreateRule] Create exception ignored: " +
+ if (getDigester().getLogger().isInfoEnabled()) {
+ getDigester().getLogger().info("[FactoryCreateRule] Create exception ignored: " +
((e.getMessage() == null) ? e.getClass().getName() : e.getMessage()));
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[FactoryCreateRule] Ignored exception:", e);
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[FactoryCreateRule] Ignored exception:", e);
}
}
exceptionIgnoredStack.push(Boolean.TRUE);
@@ -293,8 +293,8 @@ public class FactoryCreateRule extends R
} else {
Object instance = getFactory(attributes).createObject(attributes);
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[FactoryCreateRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().match +
"} New " + (instance == null ? "null object" :
instance.getClass().getName()));
}
@@ -319,16 +319,16 @@ public class FactoryCreateRule extends R
if (exceptionIgnoredStack.pop().booleanValue()) {
// creation exception was ignored
// nothing was put onto the stack
- if (getDigester().log.isTraceEnabled()) {
- getDigester().log.trace("[FactoryCreateRule] No creation so no push so no pop");
+ if (getDigester().getLogger().isTraceEnabled()) {
+ getDigester().getLogger().trace("[FactoryCreateRule] No creation so no push so no pop");
}
return;
}
}
Object top = getDigester().pop();
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[FactoryCreateRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().match +
"} Pop " + top.getClass().getName());
}
@@ -391,8 +391,8 @@ public class FactoryCreateRule extends R
realClassName = value;
}
}
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[FactoryCreateRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[FactoryCreateRule]{" + getDigester().match +
"} New factory " + realClassName);
}
Class<?> clazz = getDigester().getClassLoader().loadClass(realClassName);
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java Wed May 11 07:22:33 2011
@@ -124,8 +124,8 @@ public class ObjectCreateRule extends Ru
realClassName = value;
}
}
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[ObjectCreateRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[ObjectCreateRule]{" + getDigester().match +
"}New " + realClassName);
}
@@ -144,8 +144,8 @@ public class ObjectCreateRule extends Ru
public void end(String namespace, String name) throws Exception {
Object top = getDigester().pop();
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[ObjectCreateRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[ObjectCreateRule]{" + getDigester().match +
"} Pop " + top.getClass().getName());
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java Wed May 11 07:22:33 2011
@@ -148,13 +148,13 @@ public class SetNextRule extends Rule {
// Identify the objects to be used
Object child = getDigester().peek(0);
Object parent = getDigester().peek(1);
- if (getDigester().log.isDebugEnabled()) {
+ if (getDigester().getLogger().isDebugEnabled()) {
if (parent == null) {
- getDigester().log.debug("[SetNextRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetNextRule]{" + getDigester().match +
"} Call [NULL PARENT]." +
methodName + "(" + child + ")");
} else {
- getDigester().log.debug("[SetNextRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetNextRule]{" + getDigester().match +
"} Call " + parent.getClass().getName() + "." +
methodName + "(" + child + ")");
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java Wed May 11 07:22:33 2011
@@ -185,8 +185,8 @@ public class SetPropertiesRule extends R
}
}
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[SetPropertiesRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().match +
"} Setting property '" + attributeName + "' to '" +
value + "'");
}
@@ -224,13 +224,13 @@ public class SetPropertiesRule extends R
// Populate the corresponding properties of the top object
Object top = getDigester().peek();
- if (getDigester().log.isDebugEnabled()) {
+ if (getDigester().getLogger().isDebugEnabled()) {
if (top != null) {
- getDigester().log.debug("[SetPropertiesRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().match +
"} Set " + top.getClass().getName() +
" properties");
} else {
- getDigester().log.debug("[SetPropertiesRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetPropertiesRule]{" + getDigester().match +
"} Set NULL properties");
}
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java Wed May 11 07:22:33 2011
@@ -108,8 +108,8 @@ public class SetPropertyRule extends Rul
Object top = getDigester().peek();
// Log some debugging information
- if (getDigester().log.isDebugEnabled()) {
- getDigester().log.debug("[SetPropertyRule]{" + getDigester().match +
+ if (getDigester().getLogger().isDebugEnabled()) {
+ getDigester().getLogger().debug("[SetPropertyRule]{" + getDigester().match +
"} Set " + top.getClass().getName() + " property " +
actualName + " to " + actualValue);
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java Wed May 11 07:22:33 2011
@@ -141,13 +141,13 @@ public class SetRootRule extends Rule {
// Identify the objects to be used
Object child = getDigester().peek(0);
Object parent = getDigester().root;
- if (getDigester().log.isDebugEnabled()) {
+ if (getDigester().getLogger().isDebugEnabled()) {
if (parent == null) {
- getDigester().log.debug("[SetRootRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetRootRule]{" + getDigester().match +
"} Call [NULL ROOT]." +
methodName + "(" + child + ")");
} else {
- getDigester().log.debug("[SetRootRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetRootRule]{" + getDigester().match +
"} Call " + parent.getClass().getName() + "." +
methodName + "(" + child + ")");
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java?rev=1101774&r1=1101773&r2=1101774&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java Wed May 11 07:22:33 2011
@@ -140,13 +140,13 @@ public class SetTopRule extends Rule {
Object child = getDigester().peek(0);
Object parent = getDigester().peek(1);
- if (getDigester().log.isDebugEnabled()) {
+ if (getDigester().getLogger().isDebugEnabled()) {
if (child == null) {
- getDigester().log.debug("[SetTopRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetTopRule]{" + getDigester().match +
"} Call [NULL CHILD]." +
methodName + "(" + parent + ")");
} else {
- getDigester().log.debug("[SetTopRule]{" + getDigester().match +
+ getDigester().getLogger().debug("[SetTopRule]{" + getDigester().match +
"} Call " + child.getClass().getName() + "." +
methodName + "(" + parent + ")");
}