Index: WebdavServlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.52
diff -u -b -r1.52 WebdavServlet.java
--- WebdavServlet.java	5 Nov 2003 14:24:36 -0000	1.52
+++ WebdavServlet.java	14 Nov 2003 16:14:19 -0000
@@ -65,8 +65,6 @@
 
 import java.io.IOException;
 import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -80,7 +78,6 @@
 import org.apache.slide.common.NamespaceAccessToken;
 import org.apache.slide.common.SlideException;
 import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.SlideTokenImpl;
 import org.apache.slide.common.SlideTokenWrapper;
 import org.apache.slide.security.AccessDeniedException;
 import org.apache.slide.structure.LinkedObjectNotFoundException;
@@ -167,13 +164,14 @@
     protected void service (HttpServletRequest req, HttpServletResponse resp)
         throws ServletException, IOException {
         
-        SimpleDateFormat sdf = new SimpleDateFormat();
-        if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
-            token.getLogger().log("==> "+req.getMethod()+" start: "+sdf.format(new Date(System.currentTimeMillis()))+" ["+Thread.currentThread().getName()+"]", LOG_CHANNEL, Logger.DEBUG);
+        long time = 0;
+
+        if (token.getLogger().isEnabled(LOG_CHANNEL, Logger.INFO)) {
+            time = System.currentTimeMillis();
+            token.getLogger().log(req.getMethod() + " " + req.getRequestURI(), LOG_CHANNEL, Logger.INFO);
+        }
         
-        WebdavServletConfig config = (WebdavServletConfig)getServletConfig();
         try {
-            long startTime = System.currentTimeMillis();
             
             if (token == null) {
                 String namespaceName = req.getContextPath();
@@ -188,12 +186,9 @@
             resp.setStatus(WebdavStatus.SC_OK);
             
             String methodName = req.getMethod();
-            if ((methodName.equalsIgnoreCase("GET") ||
-                     methodName.equalsIgnoreCase("POST")) &&
-                isCollection(req)) {
-                // let the standard doGet() / doPost() methods handle
-                // GET/POST requests on collections (to display a directory
-                // index pag or something similar)
+            if (methodName.equalsIgnoreCase("GET") && isCollection(req)) {
+                // let the standard doGet() methods handle GET requests on collections
+                // (to display a directory index pag or something similar
                 super.service(req, resp);
             } else {
                 WebdavMethod method = methodFactory.createMethod(methodName);
@@ -213,8 +208,9 @@
             try { resp.sendError(WebdavStatus.SC_INTERNAL_SERVER_ERROR); } catch (Throwable ex) { }
         }
         finally {
-            if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
-                token.getLogger().log("<== "+req.getMethod()+" end: "+sdf.format(new Date(System.currentTimeMillis()))+" ["+Thread.currentThread().getName()+"]", LOG_CHANNEL, Logger.DEBUG);
+            if (token.getLogger().isEnabled(LOG_CHANNEL, Logger.INFO)) {
+                token.getLogger().log(req.getMethod() + " " + req.getRequestURI() + " by " + Thread.currentThread().getName() + " in " + (System.currentTimeMillis() - time) + "ms", LOG_CHANNEL, Logger.INFO);
+            }
         }
         
     }
Index: PropertyHelper.java
===================================================================
RCS file: /home/cvspublic/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.57
diff -u -b -r1.57 PropertyHelper.java
--- PropertyHelper.java	5 Nov 2003 14:24:35 -0000	1.57
+++ PropertyHelper.java	14 Nov 2003 16:17:23 -0000
@@ -1436,7 +1436,7 @@
                 try {
                     Document d =
                         new SAXBuilder().build( new StringReader(objectLockToken.getOwnerInfo()) );
-                    owner.addContent(d.getRootElement());
+                    owner.addContent(d.getRootElement().detach());
                 }
                 catch( Throwable e ) {
                     owner.addContent(new CDATA(objectLockToken.getOwnerInfo()));