amyroh 2004/09/17 14:02:34
Modified: jasper2/src/share/org/apache/jasper/compiler SmapUtil.java
jasper2/src/share/org/apache/jasper/runtime HttpJspBase.java
jasper2/src/share/org/apache/jasper/security
SecurityClassLoad.java
jasper2/src/share/org/apache/jasper/xmlparser
ParserUtils.java UTF8Reader.java
Log:
More logging changes.
Revision Changes Path
1.24 +31 -14
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java
Index: SmapUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SmapUtil.java 17 Mar 2004 19:23:03 -0000 1.23
+++ SmapUtil.java 17 Sep 2004 21:02:34 -0000 1.24
@@ -43,6 +43,9 @@
*/
public class SmapUtil {
+ private static org.apache.commons.logging.Log log=
+ org.apache.commons.logging.LogFactory.getLog( SmapUtil.class );
+
private static final boolean verbose = false;
//*********************************************************************
@@ -284,7 +287,8 @@
int constantPoolCountPos = genPos;
int constantPoolCount = readU2();
if (verbose) {
- System.out.println("constant pool count: " + constantPoolCount);
+ if (log.isDebugEnabled())
+ log.debug("constant pool count: " + constantPoolCount);
}
writeU2(constantPoolCount);
@@ -300,13 +304,15 @@
randomAccessWriteU2(constantPoolCountPos, constantPoolCount);
if (verbose) {
- System.out.println(
+ if (log.isDebugEnabled())
+ log.debug(
"SourceDebugExtension not found, installed at: "
+ sdeIndex);
}
} else {
if (verbose) {
- System.out.println(
+ if (log.isDebugEnabled())
+ log.debug(
"SourceDebugExtension found at: " + sdeIndex);
}
}
@@ -314,7 +320,8 @@
int interfaceCount = readU2();
writeU2(interfaceCount);
if (verbose) {
- System.out.println("interfaceCount: " + interfaceCount);
+ if (log.isDebugEnabled())
+ log.debug("interfaceCount: " + interfaceCount);
}
copy(interfaceCount * 2);
copyMembers(); // fields
@@ -323,7 +330,8 @@
int attrCount = readU2();
writeU2(attrCount);
if (verbose) {
- System.out.println("class attrCount: " + attrCount);
+ if (log.isDebugEnabled())
+ log.debug("class attrCount: " + attrCount);
}
// copy the class attributes, return true if SDE attr found (not copied)
if (!copyAttrs(attrCount)) {
@@ -331,7 +339,8 @@
++attrCount;
randomAccessWriteU2(attrCountPos, attrCount);
if (verbose) {
- System.out.println("class attrCount incremented");
+ if (log.isDebugEnabled())
+ log.debug("class attrCount incremented");
}
}
writeAttrForSDE(sdeIndex);
@@ -341,14 +350,16 @@
int count = readU2();
writeU2(count);
if (verbose) {
- System.out.println("members count: " + count);
+ if (log.isDebugEnabled())
+ log.debug("members count: " + count);
}
for (int i = 0; i < count; ++i) {
copy(6); // access, name, descriptor
int attrCount = readU2();
writeU2(attrCount);
if (verbose) {
- System.out.println("member attr count: " + attrCount);
+ if (log.isDebugEnabled())
+ log.debug("member attr count: " + attrCount);
}
copyAttrs(attrCount);
}
@@ -362,7 +373,8 @@
if (nameIndex == sdeIndex) {
sdeFound = true;
if (verbose) {
- System.out.println("SDE attr found");
+ if (log.isDebugEnabled())
+ log.debug("SDE attr found");
}
} else {
writeU2(nameIndex); // name
@@ -370,7 +382,8 @@
writeU4(len);
copy(len);
if (verbose) {
- System.out.println("attr len: " + len);
+ if (log.isDebugEnabled())
+ log.debug("attr len: " + len);
}
}
}
@@ -451,7 +464,8 @@
case 7 : // Class
case 8 : // String
if (verbose) {
- System.out.println(i + " copying 2 bytes");
+ if (log.isDebugEnabled())
+ log.debug(i + " copying 2 bytes");
}
copy(2);
break;
@@ -462,14 +476,16 @@
case 4 : // Float
case 12 : // NameAndType
if (verbose) {
- System.out.println(i + " copying 4 bytes");
+ if (log.isDebugEnabled())
+ log.debug(i + " copying 4 bytes");
}
copy(4);
break;
case 5 : // Long
case 6 : // Double
if (verbose) {
- System.out.println(i + " copying 8 bytes");
+ if (log.isDebugEnabled())
+ log.debug(i + " copying 8 bytes");
}
copy(8);
i++;
@@ -480,7 +496,8 @@
byte[] utf8 = readBytes(len);
String str = new String(utf8, "UTF-8");
if (verbose) {
- System.out.println(
+ if (log.isDebugEnabled())
+ log.debug(
i + " read class attr -- '" + str + "'");
}
if (str.equals(nameSDE)) {
1.15 +8 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java
Index: HttpJspBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HttpJspBase.java 17 Mar 2004 19:23:04 -0000 1.14
+++ HttpJspBase.java 17 Sep 2004 21:02:34 -0000 1.15
@@ -36,7 +36,13 @@
public abstract class HttpJspBase
extends HttpServlet
implements HttpJspPage
+
+
{
+
+ private static org.apache.commons.logging.Log log=
+ org.apache.commons.logging.LogFactory.getLog( HttpJspBase.class );
+
static {
if( JspFactory.getDefaultFactory() == null ) {
JspFactoryImpl factory = new JspFactoryImpl();
@@ -56,9 +62,8 @@
factory.getClass().getClassLoader().loadClass( basePackage +
"servlet.JspServletWrapper");
} catch (ClassNotFoundException ex) {
- System.out.println(
- "Jasper JspRuntimeContext preload of class
failed: " +
- ex.getMessage());
+ log.error("Jasper JspRuntimeContext preload of class failed: " +
+ ex.getMessage(), ex);
}
}
JspFactory.setDefaultFactory(factory);
1.5 +0 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/security/SecurityClassLoad.java
Index: SecurityClassLoad.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/security/SecurityClassLoad.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SecurityClassLoad.java 17 Mar 2004 19:23:05 -0000 1.4
+++ SecurityClassLoad.java 17 Sep 2004 21:02:34 -0000 1.5
@@ -104,9 +104,6 @@
loader.loadClass( basePackage +
"runtime.JspWriterImpl$1");
} catch (ClassNotFoundException ex) {
- System.out.println(
- "Jasper SecurityClassLoad preload of class failed: " +
- ex.getMessage());
log.error("SecurityClassLoad", ex);
}
}
1.11 +6 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/ParserUtils.java
Index: ParserUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/ParserUtils.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ParserUtils.java 17 Mar 2004 19:23:05 -0000 1.10
+++ ParserUtils.java 17 Sep 2004 21:02:34 -0000 1.11
@@ -175,6 +175,7 @@
// ------------------------------------------------------------ Private Classes
class MyEntityResolver implements EntityResolver {
+
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException
{
@@ -193,7 +194,8 @@
return isrc;
}
}
- System.out.println("Resolve entity failed" + publicId + " "
+ if (ParserUtils.log.isDebugEnabled())
+ ParserUtils.log.debug("Resolve entity failed" + publicId + " "
+ systemId );
ParserUtils.log.error(Localizer.getMessage("jsp.error.parse.xml.invalidPublicId",
publicId));
@@ -205,7 +207,8 @@
public void warning(SAXParseException ex)
throws SAXException
{
- System.out.println("ParserUtils: warning " + ex );
+ if (ParserUtils.log.isDebugEnabled())
+ ParserUtils.log.debug("ParserUtils: warning ", ex );
// We ignore warnings
}
1.4 +8 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/UTF8Reader.java
Index: UTF8Reader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/UTF8Reader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UTF8Reader.java 17 Mar 2004 19:23:05 -0000 1.3
+++ UTF8Reader.java 17 Sep 2004 21:02:34 -0000 1.4
@@ -30,6 +30,9 @@
public class UTF8Reader
extends Reader {
+ private static org.apache.commons.logging.Log log=
+ org.apache.commons.logging.LogFactory.getLog( UTF8Reader.class );
+
//
// Constants
//
@@ -205,7 +208,8 @@
// return character
if (DEBUG_READ) {
- System.out.println("read(): 0x"+Integer.toHexString(c));
+ if (log.isDebugEnabled())
+ log.debug("read(): 0x"+Integer.toHexString(c));
}
return c;
@@ -489,7 +493,8 @@
// return number of characters converted
if (DEBUG_READ) {
- System.out.println("read(char[],"+offset+','+length+"): count="+count);
+ if (log.isDebugEnabled())
+ log.debug("read(char[],"+offset+','+length+"): count="+count);
}
return count;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
