juergen 01/09/07 09:13:45
Modified: src/webdav/server/org/apache/slide/webdav WebdavServlet.java
Log:
the response code of the request is always logged.
Revision Changes Path
1.26 +28 -18
jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- WebdavServlet.java 2001/08/31 22:04:16 1.25
+++ WebdavServlet.java 2001/09/07 16:13:45 1.26
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
1.25 2001/08/31 22:04:16 dirkv Exp $
- * $Revision: 1.25 $
- * $Date: 2001/08/31 22:04:16 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
1.26 2001/09/07 16:13:45 juergen Exp $
+ * $Revision: 1.26 $
+ * $Date: 2001/09/07 16:13:45 $
*
* ====================================================================
*
@@ -99,6 +99,7 @@
import org.apache.slide.webdav.logger.XHttpServletRequestFacade;
import org.apache.slide.webdav.logger.XHttpServletResponseFacade;
+import org.apache.slide.webdav.logger.XHttpServletResponseSimpleFacade;
import org.apache.slide.webdav.logger.XMLTestCaseGenerator;
import org.apache.slide.webdav.method.*;
@@ -108,7 +109,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author Dirk Verbeeck
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
*/
public class WebdavServlet extends HttpServlet {
@@ -209,7 +210,7 @@
protected void service (HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- try
+ try
{
long startTime = System.currentTimeMillis();
@@ -220,6 +221,8 @@
Logger.DEBUG)) {
if ( req != null ) req = new XHttpServletRequestFacade(req);
if ( resp != null ) resp = new XHttpServletResponseFacade(resp);
+ } else {
+ if ( resp != null ) resp = new
XHttpServletResponseSimpleFacade(resp);
}
resp.setStatus(WebdavStatus.SC_OK);
@@ -235,7 +238,7 @@
}
String methodName = req.getMethod();
- WebdavServletConfig config =
+ WebdavServletConfig config =
(WebdavServletConfig)getServletConfig();
if ((methodName.equalsIgnoreCase("GET") ||
methodName.equalsIgnoreCase("POST")) &&
@@ -272,11 +275,18 @@
+ " " + (WebdavStatus.getStatusText
(((XHttpServletResponseFacade)resp)
.getStatus())))
- : ("") )
+ : (" = " + ((XHttpServletResponseSimpleFacade)resp)
+ .getStatus()
+ + " " + (WebdavStatus.getStatusText
+
(((XHttpServletResponseSimpleFacade)resp)
+ .getStatus()))) )
+ " (time: " + (System.currentTimeMillis() - startTime)
+ " ms)"
+ " URI = " + WebdavUtils.getRelativePath(
req, (WebdavServletConfig)getServletConfig()));
+
+// Domain.info("ResponseCode:" +
((XHttpServletResponseSimpleFacade)resp).getStatus() +
+// ": " +
((XHttpServletResponseSimpleFacade)resp).getMessage());
}
catch (WebdavException e) {
// There has been an error somewhere ...
@@ -291,7 +301,7 @@
/**
- * Implemented to wrap the ServletConfig object inside a
+ * Implemented to wrap the ServletConfig object inside a
* WebdavServletConfig
*/
public void init(
@@ -327,7 +337,7 @@
log("that doesn't provide Element::getElementsByTagNameNS");
log("consult the documentation for a list of valid XML parsers.");
log("======================================================");
- throw new ServletException("Invalid XML parser");
+ throw new ServletException("Invalid XML parser");
}
String namespaceName = null;
@@ -678,8 +688,8 @@
if ((permissionsList != null) && (permissionsList.hasMoreElements())) {
- writer.print("<tr" + (shade ? " bgcolor=\"eeeeee\""
- : " bgcolor=\"dddddd\"") +
+ writer.print("<tr" + (shade ? " bgcolor=\"eeeeee\""
+ : " bgcolor=\"dddddd\"") +
">\r\n");
writer.print("<td align=\"left\" colspan=\"5\"><tt><b>");
writer.print(Messages.message
@@ -719,8 +729,8 @@
while (permissionsList.hasMoreElements()) {
- writer.print("<tr" + (shade ? " bgcolor=\"eeeeee\""
- : " bgcolor=\"dddddd\"") +
+ writer.print("<tr" + (shade ? " bgcolor=\"eeeeee\""
+ : " bgcolor=\"dddddd\"") +
">\r\n");
NodePermission currentPermission =
@@ -754,7 +764,7 @@
* Display a lock list.
*
* @param locksList List of NodeLock objects
- * @param shade
+ * @param shade
* @param writer The output will be appended to this writer
*/
private void displayLocks(Enumeration locksList, PrintWriter writer,
@@ -763,8 +773,8 @@
if ((locksList != null) && (locksList.hasMoreElements())) {
- writer.print("<tr" + (shade ? " bgcolor=\"eeeeee\""
- : " bgcolor=\"dddddd\"") +
+ writer.print("<tr" + (shade ? " bgcolor=\"eeeeee\""
+ : " bgcolor=\"dddddd\"") +
">\r\n");
writer.print("<td align=\"left\" colspan=\"5\"><tt><b>");
writer.print(Messages.message
@@ -809,8 +819,8 @@
while (locksList.hasMoreElements()) {
- writer.print("<tr" + (shade ? " bgcolor=\"eeeeee\""
- : " bgcolor=\"dddddd\"") +
+ writer.print("<tr" + (shade ? " bgcolor=\"eeeeee\""
+ : " bgcolor=\"dddddd\"") +
">\r\n");
NodeLock currentLock = (NodeLock) locksList.nextElement();
