billbarker 2002/09/12 22:47:59
Modified: src/share/org/apache/tomcat/util/xml XmlMapper.java
Log:
Convert to commons-logging.
Revision Changes Path
1.41 +14 -14
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java
Index: XmlMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- XmlMapper.java 19 Dec 2001 00:02:09 -0000 1.40
+++ XmlMapper.java 13 Sep 2002 05:47:59 -0000 1.41
@@ -23,6 +23,9 @@
*/
public class XmlMapper extends HandlerBase implements SaxContext
{
+ static org.apache.commons.logging.Log logger =
+ org.apache.commons.logging.LogFactory.getLog(XmlMapper.class);
+
Locator locator;
/**
@@ -44,7 +47,6 @@
String body;
- int debug=0;
boolean validating=false;
private Hashtable entities = new Hashtable();
@@ -56,7 +58,8 @@
public void setDocumentLocator (Locator locator)
{
- if( debug>0 ) log("Set locator : " + locator);
+ if( logger.isDebugEnabled() )
+ logger.debug("Set locator : " + locator);
this.locator = locator;
}
@@ -80,7 +83,8 @@
throws SAXException
{
try {
- if( debug>5) log(sp + " <" + tag + " " + attributes + ">");
+ if( logger.isTraceEnabled() )
+ logger.trace(sp + " <" + tag + " " + attributes + ">");
attributeStack[sp]=attributes;
tagStack[sp]=tag;
sp++;
@@ -223,17 +227,15 @@
// -------------------- Utils --------------------
// Debug ( to be replaced with the real thing )
public void setDebug( int level ) {
- if(level!=0) log( "Debug level: " + level );
- debug=level;
}
public int getDebug() {
- return debug;
+ return logger.isDebugEnabled() ? 1 : 0;
}
public void setValidating( boolean validating ) {
- if (debug >= 1)
- log("Validating = " + validating);
+ if ( logger.isTraceEnabled() )
+ logger.trace("Validating = " + validating);
this.validating = validating;
}
@@ -241,12 +243,6 @@
return (this.validating);
}
- public void log(String msg) {
- // log is for debug only, it should't be enabled for anything else
- // ( no dependency on Logger or any external tomcat package )
- System.out.println("XmlMapper: " + msg);
- }
-
public void setVariable( String name, Object value ) {
if( value==null)
variables.remove(name);
@@ -271,6 +267,10 @@
public void useLocalLoader(boolean b ) {
useLocalLoader=b;
}
+ public void log(String msg) {
+ logger.info(msg);
+ }
+
static final Jdk11Compat jdk11Compat=Jdk11Compat.getJdkCompat();
/** read an XML file, construct and return the object hierarchy
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
