amyroh 2004/09/16 16:23:37
Modified: catalina/src/share/org/apache/catalina/util
CGIProcessEnvironment.java
Log:
Remove System.out and use commons.logging instead.
Revision Changes Path
1.6 +15 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
Index: CGIProcessEnvironment.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CGIProcessEnvironment.java 29 Aug 2004 16:46:13 -0000 1.5
+++ CGIProcessEnvironment.java 16 Sep 2004 23:23:37 -0000 1.6
@@ -36,6 +36,11 @@
*/
public class CGIProcessEnvironment extends ProcessEnvironment {
+
+
+ private static org.apache.commons.logging.Log log=
+ org.apache.commons.logging.LogFactory.getLog( CGIProcessEnvironment.class );
+
/** cgi command's query parameters */
private Hashtable queryParameters = null;
@@ -340,8 +345,9 @@
webAppRootDir = webAppRootDir + File.separator
+ cgiPathPrefix;
}
- if (debug >= 2) {
- log("findCGI: start = [" + webAppRootDir
+
+ if (log.isDebugEnabled()) {
+ log.debug("findCGI: start = [" + webAppRootDir
+ "], pathInfo = [" + pathInfo + "] ");
}
File currentLocation = new File(webAppRootDir);
@@ -349,15 +355,15 @@
while (!currentLocation.isFile() && dirWalker.hasMoreElements()) {
currentLocation = new
File(currentLocation, (String) dirWalker.nextElement());
- if (debug >= 3) {
- log("findCGI: traversing to [" + currentLocation + "]");
+ if (log.isDebugEnabled()) {
+ log.debug("findCGI: traversing to [" + currentLocation + "]");
}
}
if (!currentLocation.isFile()) {
return new String[] { null, null, null, null };
} else {
- if (debug >= 2) {
- log("findCGI: FOUND cgi at [" + currentLocation + "]");
+ if (log.isDebugEnabled()) {
+ log.debug("findCGI: FOUND cgi at [" + currentLocation + "]");
}
path = currentLocation.getAbsolutePath();
name = currentLocation.getName();
@@ -370,8 +376,8 @@
scriptname = contextPath + servletPath + cginame;
}
}
- if (debug >= 1) {
- log("findCGI calc: name=" + name + ", path=" + path
+ if (log.isDebugEnabled()) {
+ log.debug("findCGI calc: name=" + name + ", path=" + path
+ ", scriptname=" + scriptname + ", cginame=" + cginame);
}
return new String[] { path, scriptname, cginame, name };
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
