pnever 02/04/23 01:16:39
Modified: src/webdav/server/org/apache/slide/webdav/util XMLValue.java
VersioningHelper.java PropertyRetrieverImpl.java
PropertyHelper.java
src/webdav/server/org/apache/slide/webdav/method
ReportMethod.java
Log:
Adapted to changes in JDOM: SAXBuilder::build() now throws IOException.
Revision Changes Path
1.4 +11 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/XMLValue.java
Index: XMLValue.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/XMLValue.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLValue.java 28 Mar 2002 06:12:13 -0000 1.3
+++ XMLValue.java 23 Apr 2002 08:16:39 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/XMLValue.java,v
1.3 2002/03/28 06:12:13 jericho Exp $
- * $Revision: 1.3 $
- * $Date: 2002/03/28 06:12:13 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/XMLValue.java,v
1.4 2002/04/23 08:16:39 pnever Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/23 08:16:39 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
* The {@link #toString toString()} method provides a XML document fragment
* describing the Elements of this XMLValue.
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
**/
@@ -166,7 +166,12 @@
*/
public XMLValue(String xmlString) throws JDOMException,
IllegalArgumentException{
this((List)null);
- add(xmlString);
+ try {
+ add(xmlString);
+ }
+ catch( IOException x ) {
+ x.printStackTrace();
+ }
}
@@ -218,7 +223,7 @@
* is not a <code>Element</code>.
* @throws JDOMException if parsing the <code>xmlString</code> fails.
*/
- public void add(String xmlString) throws IllegalArgumentException,
JDOMException {
+ public void add(String xmlString) throws IllegalArgumentException,
JDOMException, IOException {
if (xmlString != null) {
StringBuffer buffer = new StringBuffer(START_TAG.length() +
1.32 +6 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- VersioningHelper.java 15 Apr 2002 13:00:01 -0000 1.31
+++ VersioningHelper.java 23 Apr 2002 08:16:39 -0000 1.32
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.31 2002/04/15 13:00:01 juergen Exp $
- * $Revision: 1.31 $
- * $Date: 2002/04/15 13:00:01 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.32 2002/04/23 08:16:39 pnever Exp $
+ * $Revision: 1.32 $
+ * $Date: 2002/04/23 08:16:39 $
*
* ====================================================================
*
@@ -1383,6 +1383,9 @@
element = document.getRootElement();
}
catch (JDOMException e) {}
+ catch (Exception e) {
+ e.printStackTrace();
+ }
return element;
}
1.9 +13 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java
Index: PropertyRetrieverImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PropertyRetrieverImpl.java 28 Mar 2002 06:12:13 -0000 1.8
+++ PropertyRetrieverImpl.java 23 Apr 2002 08:16:39 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
1.8 2002/03/28 06:12:13 jericho Exp $
- * $Revision: 1.8 $
- * $Date: 2002/03/28 06:12:13 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
1.9 2002/04/23 08:16:39 pnever Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/04/23 08:16:39 $
*
* ====================================================================
*
@@ -119,6 +119,7 @@
import java.util.Set;
import java.util.List;
import java.util.ArrayList;
+import java.util.Collections;
import org.jdom.Document;
import org.jdom.Element;
@@ -134,7 +135,7 @@
* providing property information (<code>PropFindMethod</code>,
* <code>ReportMethod</code>) should use this class.
*
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -282,7 +283,7 @@
* @throws JDOMException if the transforming the String into a
* JDOM Document fails.
*/
- protected List getElementListFromXMLPrinter(XMLPrinter xmlPrinter) throws
JDOMException {
+ protected List getElementListFromXMLPrinter(XMLPrinter xmlPrinter) throws
JDOMException, IOException {
String xmlString = xmlPrinter.toString();
StringBuffer buffer = new StringBuffer(START_TAG.length() +
xmlString.length() + END_TAG.length());
@@ -444,7 +445,13 @@
XMLPrinter xmlPrinter = new XMLPrinter();
writePropertiesOfObject(requestedProperties, revisionDescriptors,
revisionDescriptor, contextPath, serverURL, allpropSupportsDeltaV, xmlPrinter);
- return getElementListFromXMLPrinter(xmlPrinter);
+ try {
+ return getElementListFromXMLPrinter(xmlPrinter);
+ }
+ catch( IOException x ) {
+ x.printStackTrace();
+ return Collections.EMPTY_LIST;
+ }
}
1.12 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PropertyHelper.java 5 Apr 2002 16:11:44 -0000 1.11
+++ PropertyHelper.java 23 Apr 2002 08:16:39 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
1.11 2002/04/05 16:11:44 pnever Exp $
- * $Revision: 1.11 $
- * $Date: 2002/04/05 16:11:44 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
1.12 2002/04/23 08:16:39 pnever Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/04/23 08:16:39 $
*
* ====================================================================
*
@@ -374,7 +374,7 @@
/**
* Parse an XML-Valued property value.
*/
- public Element parsePropertyValue( String propValue ) throws JDOMException {
+ public Element parsePropertyValue( String propValue ) throws JDOMException,
IOException {
Document d = xmlBuilder.build( new StringReader(propValue) );
return d.getRootElement();
}
1.19 +7 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java
Index: ReportMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ReportMethod.java 22 Apr 2002 16:20:55 -0000 1.18
+++ ReportMethod.java 23 Apr 2002 08:16:39 -0000 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.18 2002/04/22 16:20:55 wam Exp $
- * $Revision: 1.18 $
- * $Date: 2002/04/22 16:20:55 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.19 2002/04/23 08:16:39 pnever Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/04/23 08:16:39 $
*
* ====================================================================
*
@@ -164,7 +164,7 @@
/**
* An implementation of the DeltaV <code>REPORT</code> method.
*
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -1517,6 +1517,9 @@
text = document.getRootElement().getText();
}
catch (JDOMException e) {}
+ catch (Exception e) {
+ e.printStackTrace();
+ }
return text;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
