juergen 02/05/17 04:55:58
Modified: src/webdav/server/org/apache/slide/webdav/method
PropPatchMethod.java
Log:
Constants for DAV and Slide namespace URIs and prefixes has been removed from class
WebdavConstants. The appropriate constants of NamespaceCache are now used instead.
Do not provide the DAV: namespace as default if the property does not define any
namespace.
(ralf)
Revision Changes Path
1.44 +13 -17
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- PropPatchMethod.java 17 May 2002 05:54:32 -0000 1.43
+++ PropPatchMethod.java 17 May 2002 11:55:58 -0000 1.44
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.43 2002/05/17 05:54:32 juergen Exp $
- * $Revision: 1.43 $
- * $Date: 2002/05/17 05:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.44 2002/05/17 11:55:58 juergen Exp $
+ * $Revision: 1.44 $
+ * $Date: 2002/05/17 11:55:58 $
*
* ====================================================================
*
@@ -82,6 +82,7 @@
import org.apache.slide.structure.*;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.webdav.util.*;
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
@@ -133,11 +134,6 @@
*/
private String resourcePath;
- /**
- * Constant for the <code>DAV:</code> namespace (with prefix <code>D</code>)
- */
- protected static final org.jdom.Namespace DAV_NAMESPACE =
org.jdom.Namespace.getNamespace(DEFAULT_PREFIX,
-
DEFAULT_NAMESPACE);
// ----------------------------------------------------------- Constructors
@@ -526,10 +522,10 @@
private void writeReport()
throws WebdavException {
- org.jdom.Element multistatus = new org.jdom.Element(E_MULTISTATUS,
DAV_NAMESPACE);
- org.jdom.Element response = new org.jdom.Element(E_RESPONSE, DAV_NAMESPACE);
+ org.jdom.Element multistatus = new org.jdom.Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
+ org.jdom.Element response = new org.jdom.Element(E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
multistatus.addContent(response);
- org.jdom.Element href = new org.jdom.Element(E_HREF, DAV_NAMESPACE);
+ org.jdom.Element href = new org.jdom.Element(E_HREF,
NamespaceCache.DEFAULT_NAMESPACE);
href.setText(getFullPath(requestUri));
response.addContent(href);
@@ -576,18 +572,18 @@
*/
private org.jdom.Element createPropstatElement(Property property) {
- org.jdom.Element propstat = new org.jdom.Element(E_PROPSTAT, DAV_NAMESPACE);
- org.jdom.Element prop = new org.jdom.Element(E_PROP, DAV_NAMESPACE);
+ org.jdom.Element propstat = new org.jdom.Element(E_PROPSTAT,
NamespaceCache.DEFAULT_NAMESPACE);
+ org.jdom.Element prop = new org.jdom.Element(E_PROP,
NamespaceCache.DEFAULT_NAMESPACE);
propstat.addContent(prop);
- org.jdom.Namespace namespace =
org.jdom.Namespace.getNamespace(property.namespace);
- if ( (property.namespace != null) &&
property.namespace.equals(DAV_NAMESPACE.getURI()) ) {
- namespace = DAV_NAMESPACE;
+ org.jdom.Namespace namespace = org.jdom.Namespace.NO_NAMESPACE;
+ if (property.namespace != null) {
+ namespace = NamespaceCache.getNamespace(property.namespace);
}
org.jdom.Element propertyElement = new org.jdom.Element(property.name,
namespace);
prop.addContent(propertyElement);
- org.jdom.Element status = new org.jdom.Element(E_STATUS, DAV_NAMESPACE);
+ org.jdom.Element status = new org.jdom.Element(E_STATUS,
NamespaceCache.DEFAULT_NAMESPACE);
status.setText("HTTP/1.1 " + property.status + " "
+ WebdavStatus.getStatusText(property.status));
propstat.addContent(status);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
