[prev in list] [next in list] [prev in thread] [next in thread]
List: slide-dev
Subject: cvs commit: jakarta-slide/src/share/org/apache/slide/webdav/method LockMethod.java OptionsMethod.jav
From: remm () locus ! apache ! org
Date: 2000-06-15 6:52:08
[Download RAW message or body]
remm 00/06/14 23:52:08
Modified: src/share/org/apache/slide/webdav/method LockMethod.java
OptionsMethod.java PropFindMethod.java
PropPatchMethod.java WebdavMethod.java
Log:
- Remove dependency with Xerces (use JAXP instead) - part 1
Package org.apache.slide.util.dom is still Xerces dependent, but it
will be fixed soon.
Revision Changes Path
1.4 +7 -7 \
jakarta-slide/src/share/org/apache/slide/webdav/method/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/LockMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LockMethod.java 2000/05/16 23:07:43 1.3
+++ LockMethod.java 2000/06/15 06:52:07 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/LockMethod.java,v \
1.3 2000/05/16 23:07:43 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2000/05/16 23:07:43 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/LockMethod.java,v \
1.4 2000/06/15 06:52:07 remm Exp $ + * $Revision: 1.4 $
+ * $Date: 2000/06/15 06:52:07 $
*
* ====================================================================
*
@@ -69,6 +69,7 @@
import javax.servlet.*;
import javax.servlet.http.*;
import org.w3c.dom.*;
+import org.xml.sax.InputSource;
import org.apache.slide.common.*;
import org.apache.slide.webdav.common.*;
import org.apache.slide.webdav.*;
@@ -77,8 +78,8 @@
import org.apache.slide.content.*;
import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.structure.*;
-import org.apache.slide.util.dom.DOMParser;
import org.apache.slide.util.dom.DOMWriter;
+import javax.xml.parsers.DocumentBuilder;
/**
* WebDAV LOCK Method.
@@ -279,9 +280,8 @@
Node lockInfoNode = null;
try {
- DOMParser parser = new DOMParser();
- Document document = parser.parse(new StringReader
- (new String(requestBody)));
+ Document document = documentBuilder.parse(new InputSource
+ (new StringReader(new String(requestBody))));
// Get the root element of the document
Element rootElement = document.getDocumentElement();
1.2 +3 -4 \
jakarta-slide/src/share/org/apache/slide/webdav/method/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/OptionsMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OptionsMethod.java 2000/05/09 02:47:34 1.1
+++ OptionsMethod.java 2000/06/15 06:52:07 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/OptionsMethod.java,v \
1.1 2000/05/09 02:47:34 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/05/09 02:47:34 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/OptionsMethod.java,v \
1.2 2000/06/15 06:52:07 remm Exp $ + * $Revision: 1.2 $
+ * $Date: 2000/06/15 06:52:07 $
*
* ====================================================================
*
@@ -76,7 +76,6 @@
import org.apache.slide.structure.*;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
-import org.apache.slide.util.dom.DOMParser;
/**
* WebDAV OPTIONS Method.
1.3 +8 -7 \
jakarta-slide/src/share/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropFindMethod.java 2000/05/16 23:07:43 1.2
+++ PropFindMethod.java 2000/06/15 06:52:07 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/PropFindMethod.java,v \
1.2 2000/05/16 23:07:43 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/05/16 23:07:43 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/PropFindMethod.java,v \
1.3 2000/06/15 06:52:07 remm Exp $ + * $Revision: 1.3 $
+ * $Date: 2000/06/15 06:52:07 $
*
* ====================================================================
*
@@ -69,6 +69,7 @@
import javax.servlet.*;
import javax.servlet.http.*;
import org.w3c.dom.*;
+import org.xml.sax.InputSource;
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.common.*;
import org.apache.slide.security.AccessDeniedException;
@@ -77,7 +78,7 @@
import org.apache.slide.structure.*;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
-import org.apache.slide.util.dom.DOMParser;
+import javax.xml.parsers.DocumentBuilder;
/**
* WebDAV PROPFIND Implementation.
@@ -213,9 +214,9 @@
Node propNode = null;
try {
- DOMParser parser = new DOMParser();
- Document document = parser.parse
- (new StringReader(new String(requestBody)));
+ Document document =
+ documentBuilder.parse(new InputSource
+ (new StringReader(new String(requestBody))));
// Get the root element of the document
Element rootElement = document.getDocumentElement();
1.3 +7 -7 \
jakarta-slide/src/share/org/apache/slide/webdav/method/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/PropPatchMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropPatchMethod.java 2000/05/16 23:07:43 1.2
+++ PropPatchMethod.java 2000/06/15 06:52:08 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/PropPatchMethod.java,v \
1.2 2000/05/16 23:07:43 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/05/16 23:07:43 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/PropPatchMethod.java,v \
1.3 2000/06/15 06:52:08 remm Exp $ + * $Revision: 1.3 $
+ * $Date: 2000/06/15 06:52:08 $
*
* ====================================================================
*
@@ -69,6 +69,7 @@
import javax.servlet.*;
import javax.servlet.http.*;
import org.w3c.dom.*;
+import org.xml.sax.InputSource;
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.common.*;
import org.apache.slide.security.AccessDeniedException;
@@ -77,7 +78,7 @@
import org.apache.slide.structure.*;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
-import org.apache.slide.util.dom.DOMParser;
+import javax.xml.parsers.DocumentBuilder;
/**
* WebDAV PROPPATCH Implementation.
@@ -139,9 +140,8 @@
Node setNode = null;
Node removeNode = null;
- DOMParser parser = new DOMParser();
- Document document = parser.parse
- (new StringReader(new String(requestBody)));
+ Document document = documentBuilder.parse(new InputSource(
+ (new StringReader(new String(requestBody)))));
// Get the root element of the document
Element rootElement = document.getDocumentElement();
1.3 +21 -3 \
jakarta-slide/src/share/org/apache/slide/webdav/method/WebdavMethod.java
Index: WebdavMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/WebdavMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebdavMethod.java 2000/05/16 23:58:25 1.2
+++ WebdavMethod.java 2000/06/15 06:52:08 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/WebdavMethod.java,v \
1.2 2000/05/16 23:58:25 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/05/16 23:58:25 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/WebdavMethod.java,v \
1.3 2000/06/15 06:52:08 remm Exp $ + * $Revision: 1.3 $
+ * $Date: 2000/06/15 06:52:08 $
*
* ====================================================================
*
@@ -77,6 +77,9 @@
import org.apache.slide.security.*;
import org.apache.slide.webdav.common.*;
import org.apache.slide.webdav.*;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
/**
* WebDAV method.
@@ -176,6 +179,12 @@
protected CredentialsToken credToken;
+ /**
+ * DOM XML parser.
+ */
+ protected static DocumentBuilder documentBuilder;
+
+
// ----------------------------------------------------------- Constructors
@@ -186,6 +195,15 @@
String requestUri, Principal principal,
HttpServletRequest req, HttpServletResponse resp,
char[] requestBody) {
+
+ if (documentBuilder == null) {
+ try {
+ documentBuilder =
+ DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ } catch(ParserConfigurationException e) {
+ e.printStackTrace();
+ }
+ }
this.requestUri = requestUri;
this.principal = principal;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic