juergen 02/05/15 04:44:38
Modified: src/webdav/server/org/apache/slide/webdav/method
AbstractMultistatusResponseMethod.java
PropFindMethod.java ReportMethod.java
UpdateMethod.java WebdavMethod.java
Log:
Use "DAV:" namespace with prefix "D" instead of using it as the default namespace.
(ralf)
Revision Changes Path
1.21 +15 -9
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java
Index: AbstractMultistatusResponseMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractMultistatusResponseMethod.java 29 Apr 2002 12:07:03 -0000 1.20
+++ AbstractMultistatusResponseMethod.java 15 May 2002 11:44:37 -0000 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v
1.20 2002/04/29 12:07:03 juergen Exp $
- * $Revision: 1.20 $
- * $Date: 2002/04/29 12:07:03 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v
1.21 2002/05/15 11:44:37 juergen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2002/05/15 11:44:37 $
*
* ====================================================================
*
@@ -99,6 +99,12 @@
public abstract class AbstractMultistatusResponseMethod extends WebdavMethod
implements WebdavConstants {
+ /**
+ * Constant for the <code>DAV:</code> namespace (with prefix <code>D</code>)
+ */
+ protected static final Namespace DAV_NAMESPACE =
Namespace.getNamespace(DEFAULT_PREFIX,
+
DEFAULT_NAMESPACE);
+
// ----------------------------------------------------- Instance Variables
@@ -238,20 +244,20 @@
protected String generateErrorMessage
(NestedSlideException nestedException) {
- Element multistatus = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element multistatus = new Element(E_MULTISTATUS, DAV_NAMESPACE);
Enumeration nestedExceptionsList =
nestedException.enumerateExceptions();
while (nestedExceptionsList.hasMoreElements()) {
- Element response = new Element(E_RESPONSE,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element response = new Element(E_RESPONSE, DAV_NAMESPACE);
multistatus.addContent(response);
SlideException ex =
(SlideException) nestedExceptionsList.nextElement();
generateStatusText(response, getErrorMessage(ex),
getErrorCode(ex));
if (ex instanceof PreconditionViolationException) {
-
multistatus.addContent(getPreconditionViolationResponseDescription((PreconditionViolationException)ex));
+
response.addContent(getPreconditionViolationResponseDescription((PreconditionViolationException)ex));
}
}
@@ -277,10 +283,10 @@
*/
protected void generateStatusText(Element parentElement, String href, int
statusCode) {
- Element hrefElement = new Element(E_HREF,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element hrefElement = new Element(E_HREF, DAV_NAMESPACE);
parentElement.addContent(hrefElement);
hrefElement.setText(WebdavUtils.encodeURL(href));
- Element statusElement = new Element(E_STATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element statusElement = new Element(E_STATUS, DAV_NAMESPACE);
parentElement.addContent(statusElement);
statusElement.setText("HTTP/1.1 " + statusCode + " "
+ WebdavStatus.getStatusText(statusCode));
@@ -297,7 +303,7 @@
*/
protected Element
getPreconditionViolationResponseDescription(PreconditionViolationException pve) {
- Element responseDescription = new Element(E_RESPONSEDESCRIPTION,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element responseDescription = new Element(E_RESPONSEDESCRIPTION,
DAV_NAMESPACE);
responseDescription.addContent(getPreconditionViolationError(pve.getViolatedPrecondition()));
return responseDescription;
}
1.69 +22 -18
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- PropFindMethod.java 14 May 2002 15:33:42 -0000 1.68
+++ PropFindMethod.java 15 May 2002 11:44:37 -0000 1.69
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.68 2002/05/14 15:33:42 pnever Exp $
- * $Revision: 1.68 $
- * $Date: 2002/05/14 15:33:42 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.69 2002/05/15 11:44:37 juergen Exp $
+ * $Revision: 1.69 $
+ * $Date: 2002/05/15 11:44:37 $
*
* ====================================================================
*
@@ -141,6 +141,11 @@
*/
protected static final int FIND_PROPERTY_NAMES = 2;
+ /**
+ * Constant for the <code>DAV:</code> namespace (with prefix <code>D</code>)
+ */
+ protected static final Namespace DAV_NAMESPACE =
Namespace.getNamespace(DEFAULT_PREFIX,
+
DEFAULT_NAMESPACE);
// ----------------------------------------------------- Instance Variables
@@ -356,7 +361,7 @@
resp.setContentType("text/xml; charset=UTF-8");
// Create multistatus object
- Element multistatusElement = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element multistatusElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
if (resource != null) {
if (depth == 0) {
@@ -442,7 +447,7 @@
return getErrorResponse(resourceUri, getErrorCode(e), null);
}
- Element responseElement = new Element(E_RESPONSE,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element responseElement = new Element(E_RESPONSE, DAV_NAMESPACE);
String status = new String(HTTP_VERSION + WebdavStatus.SC_OK + " "
+ WebdavStatus.getStatusText
@@ -456,7 +461,7 @@
String serverURL = HTTP_PROTOCOL + req.getServerName()+ ":" +
req.getServerPort();
try {
- Element hrefElement = new Element(E_HREF,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element hrefElement = new Element(E_HREF, DAV_NAMESPACE);
VersioningHelper vHelp = VersioningHelper.getVersioningHelper(
slideToken, token, req, resp, getConfig() );
@@ -542,9 +547,9 @@
+ " " + WebdavStatus.getStatusText
(WebdavStatus.SC_OK));
- Element propstatElement = new Element(E_PROPSTAT,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element propstatElement = new Element(E_PROPSTAT, DAV_NAMESPACE);
responseElement.addContent(propstatElement);
- Element propElement = new Element(E_PROPSTAT,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element propElement = new Element(E_PROPSTAT, DAV_NAMESPACE);
propstatElement.addContent(propElement);
ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, object.getUri(), revisionDescriptor);
@@ -566,11 +571,10 @@
Iterator iterator = propertySet.iterator();
while (iterator.hasNext()) {
- Element propertyElement = new
Element(iterator.next().toString(),
-
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element propertyElement = new
Element(iterator.next().toString(), DAV_NAMESPACE);
propElement.addContent(propertyElement);
}
- Element statusElement = new Element(E_STATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element statusElement = new Element(E_STATUS, DAV_NAMESPACE);
propElement.addContent(statusElement);
break;
}
@@ -589,27 +593,27 @@
*/
private Element getErrorResponse(String resourcePath, int errorCode, String
condition) {
- Element response = new Element(E_RESPONSE,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element response = new Element(E_RESPONSE, DAV_NAMESPACE);
- Element href = new Element(E_HREF,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element href = new Element(E_HREF, DAV_NAMESPACE);
href.setText(HTTP_PROTOCOL +
req.getServerName()+ ":" +
req.getServerPort() +
req.getContextPath() +
resourcePath);
response.addContent(href);
- Element propStat = new Element(E_PROPSTAT,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element propStat = new Element(E_PROPSTAT, DAV_NAMESPACE);
response.addContent(propStat);
- Element status = new Element(E_STATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element status = new Element(E_STATUS, DAV_NAMESPACE);
status.setText(HTTP_VERSION + " " + errorCode + " " +
WebdavStatus.getStatusText(errorCode));
propStat.addContent(status);
if (condition != null) {
- Element responseDescriptiont = new Element(E_RESPONSEDESCRIPTION,
Namespace.getNamespace(DEFAULT_NAMESPACE));
- Element errorElement = new Element(E_ERROR,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element responseDescriptiont = new Element(E_RESPONSEDESCRIPTION,
DAV_NAMESPACE);
+ Element errorElement = new Element(E_ERROR, DAV_NAMESPACE);
responseDescriptiont.addContent(errorElement);
- Element conditionElement = new Element(condition,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element conditionElement = new Element(condition, DAV_NAMESPACE);
errorElement.addContent(conditionElement);
propStat.addContent(responseDescriptiont);
}
1.27 +47 -39
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ReportMethod.java 14 May 2002 15:33:43 -0000 1.26
+++ ReportMethod.java 15 May 2002 11:44:37 -0000 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.26 2002/05/14 15:33:43 pnever Exp $
- * $Revision: 1.26 $
- * $Date: 2002/05/14 15:33:43 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.27 2002/05/15 11:44:37 juergen Exp $
+ * $Revision: 1.27 $
+ * $Date: 2002/05/15 11:44:37 $
*
* ====================================================================
*
@@ -168,7 +168,7 @@
/**
* An implementation of the DeltaV <code>REPORT</code> method.
*
- * @version $Revision: 1.26 $
+ * @version $Revision: 1.27 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -215,6 +215,11 @@
protected static final int INFINITY = Integer.MAX_VALUE;
/**
+ * Constant for the <code>DAV:</code> namespace (with prefix <code>D</code>)
+ */
+ protected static final Namespace DAV_NAMESPACE =
Namespace.getNamespace(DEFAULT_PREFIX,
+
DEFAULT_NAMESPACE);
+ /**
* 'seach requirements' of a principal-property-search request
*/
protected Set propertySearchSet = null;
@@ -579,38 +584,38 @@
Element resultElement = null;
try {
if (R_VERSION_TREE.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeVersionTreeReport(requestUri, resultElement, getDepth());
}
else if (R_EXPAND_PROPERTY.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeExpandPropertyReport(requestUri, resultElement, getDepth());
}
else if (R_ACL_PRINCIPAL_PROPS.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeAclPrincipalReport(requestUri, resultElement, getDepth());
}
else if (R_PRINCIPAL_MATCH.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeAclMatchReport (resultElement, getDepth());
}
else if (R_PRINCIPAL_SEARCH_PROPERTY_SET.equals(requestedReport)) {
- resultElement = new Element(R_PRINCIPAL_SEARCH_PROPERTY_SET,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ resultElement = new Element(R_PRINCIPAL_SEARCH_PROPERTY_SET,
DAV_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_OK);
executePrincipalSearchPropertySetReport (requestUri, resultElement);
}
else if (R_PRINCIPAL_PROPERTY_SEARCH.equals(requestedReport)) {
- //resultElement = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ //resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_OK);
resultElement = executePrincipalSearchPropertyReport (getDepth());
}
else if (R_LOCATE_BY_HISTORY.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeLocateByHistoryReport(requestUri, resultElement, getDepth());
}
@@ -806,9 +811,9 @@
*/
private Element getResponseElement(String slideUri, NodeRevisionDescriptors
revisionDescriptors, NodeRevisionNumber revisionNumber, SlideToken slideToken, String
requestUri, RequestedProperties requestedProperties) throws JDOMException {
- Element response = new Element(E_RESPONSE,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element response = new Element(E_RESPONSE, DAV_NAMESPACE);
- Element href = new Element(E_HREF,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element href = new Element(E_HREF, DAV_NAMESPACE);
String serverURL = HTTP_PROTOCOL + req.getServerName()+ ":" +
req.getServerPort();
href.setText(serverURL + req.getContextPath() + requestUri);
response.addContent(href);
@@ -867,6 +872,7 @@
* @throws JDOMException
*/
protected void executeAclPrincipalReport(String requestUri, Element
parentElement, int depth) throws WebdavException, ObjectLockedException,
RevisionDescriptorNotFoundException, ServiceAccessException,
LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException,
JDOMException {
+
NodeRevisionDescriptors revisionDescriptors = null;
NodeRevisionDescriptor revisionDescriptor = null;
NodeRevisionNumber revisionNumber = null;
@@ -882,9 +888,9 @@
// get acl
// create virtuel ACL property object
- Element aclproperty = new Element(E_PROPERTY,DEFAULT_NAMESPACE);
+ Element aclproperty = new Element(E_PROPERTY, DAV_NAMESPACE);
aclproperty.setAttribute(PARAM_NAME,P_ACL);
- Element prop = new Element(E_PROP,DEFAULT_NAMESPACE);
+ Element prop = new Element(E_PROP, DAV_NAMESPACE);
prop.addContent(aclproperty);
RequestedPropertiesImpl reqProperties = new RequestedPropertiesImpl(prop);
@@ -935,24 +941,24 @@
Iterator iterator = propstatList.iterator();
aclpropstat = ((Element)iterator.next());
- aclprops = aclpropstat.getChild(E_PROP,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ aclprops = aclpropstat.getChild(E_PROP, DAV_NAMESPACE);
if (aclprops != null) {
- acl = aclprops.getChild(P_ACL,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ acl = aclprops.getChild(P_ACL, DAV_NAMESPACE);
} else return;
if (aclprops != null) {
- acl = aclprops.getChild(P_ACL,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ acl = aclprops.getChild(P_ACL, DAV_NAMESPACE);
} else return;
- aces = acl.getChildren(P_ACE, Namespace.getNamespace(DEFAULT_NAMESPACE));
+ aces = acl.getChildren(P_ACE, DAV_NAMESPACE);
// get Principals
Iterator aceIter = aces.iterator();
Element current = null;
while (aceIter.hasNext()) {
- current = ((Element) aceIter.next()).getChild(K_PRINCIPAL,
Namespace.getNamespace(DEFAULT_NAMESPACE)).getChild("href",
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ current = ((Element) aceIter.next()).getChild(K_PRINCIPAL,
DAV_NAMESPACE).getChild(E_HREF, DAV_NAMESPACE);
if (current != null){
principals.add(current.getText());
}
@@ -1125,13 +1131,12 @@
*/
protected Element executePrincipalSearchPropertyReport(int depth) throws
WebdavException, SlideException, JDOMException {
- Element parentElement = new Element(E_MULTISTATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element parentElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
SearchQueryResult queryResult = null;
Iterator searchPropIter = null;
Element currentSearchProperty = null;
String currentUri = req.getRequestURI();
searchPropIter = propertySearchSet.iterator();
- org.jdom.Namespace namespace = org.jdom.Namespace.getNamespace
(DEFAULT_PREFIX, DEFAULT_NAMESPACE);
Set principalCollectionSet = new HashSet();
String searchReq = null;
String whereElement = null;
@@ -1139,8 +1144,8 @@
// do propfind principal-collection-set element, parse through the answere
// and add the found principal-collection-sets to the
principalCollectionSet Set instance
- Element principalCollectionSetElement = new Element(E_PROP, namespace);
- principalCollectionSetElement.addContent(new
Element(E_PRINCIPAL_COLLECTION_SET, namespace));
+ Element principalCollectionSetElement = new Element(E_PROP, DAV_NAMESPACE);
+ principalCollectionSetElement.addContent(new
Element(E_PRINCIPAL_COLLECTION_SET, DAV_NAMESPACE));
RequestedProperties collectionSetProp = new
RequestedPropertiesImpl(principalCollectionSetElement);
List collectionSets = retrieveProperties(requestUri, collectionSetProp);
Iterator collectionSetsIter = collectionSets.iterator();
@@ -1270,11 +1275,10 @@
List propList = null;
String serverURL = "http://"; + req.getServerName()+ ":" +
req.getServerPort();
PropertyRetriever retriever = new PropertyRetrieverImpl(token, slideToken);
- org.jdom.Namespace namespace = org.jdom.Namespace.getNamespace
(DEFAULT_PREFIX, DEFAULT_NAMESPACE);
- org.jdom.Element responseElement = new org.jdom.Element (E_RESPONSE,
namespace);
+ org.jdom.Element responseElement = new org.jdom.Element (E_RESPONSE,
DAV_NAMESPACE);
parentElement.addContent (responseElement);
- org.jdom.Element hrefElement = new org.jdom.Element (E_HREF, namespace);
+ org.jdom.Element hrefElement = new org.jdom.Element (E_HREF, DAV_NAMESPACE);
hrefElement.addContent(PropertyHelper.getAbsoluteURL(serverURL,
req.getContextPath(), currentIntUrl));
responseElement.addContent (hrefElement);
@@ -1344,12 +1348,12 @@
// write result
while (propertiesIter.hasNext()) {
currentProperty = (PropertySearchSetProperty) propertiesIter.next();
- Element searchProp = new
Element(E_PRINCIPAL_SEARCH_PROPERTY,DEFAULT_NAMESPACE );
- Element prop = new Element (E_PROP,DEFAULT_NAMESPACE );
+ Element searchProp = new Element(E_PRINCIPAL_SEARCH_PROPERTY,
DAV_NAMESPACE );
+ Element prop = new Element (E_PROP, DAV_NAMESPACE );
Element propContent = new Element
(currentProperty.getPropertyName(),currentProperty.getNamespace());
- Element description = new Element (E_DESCRIPTION,DEFAULT_NAMESPACE );
+ Element description = new Element (E_DESCRIPTION, DAV_NAMESPACE );
Attribute lang = new Attribute ("xml:lang","en");
-// Element descContent = new Element (currentDesc,
WebdavConstants.DEFAULT_NAMESPACE);
+ // Element descContent = new Element (currentDesc,
DAV_NAMESPACE);
description.setAttribute(lang);
description.addContent(currentProperty.getDescription());
prop.addContent(propContent);
@@ -1420,7 +1424,11 @@
List childPropertyList = propertyElement.getChildren();
if (childPropertyList.size() > 0) {
try {
- Element hrefElement = response.getChild(E_PROPSTAT,
Namespace.getNamespace(DEFAULT_NAMESPACE)).getChild(E_PROP,
Namespace.getNamespace(DEFAULT_NAMESPACE)).getChild(propertyElement.getAttribute("name").getValue(),
Namespace.getNamespace(DEFAULT_NAMESPACE)).getChild(E_HREF,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element hrefElement = response.
+ getChild(E_PROPSTAT, DAV_NAMESPACE).
+ getChild(E_PROP, DAV_NAMESPACE).
+
getChild(propertyElement.getAttribute("name").getValue(), DAV_NAMESPACE).
+ getChild(E_HREF, DAV_NAMESPACE);
if (hrefElement.getText() != null) {
// replace the <href> with <response> of the
corresponding resource
@@ -1622,27 +1630,27 @@
*/
private Element getErrorResponse(String requestUri, int errorCode, String
condition) {
- Element response = new Element(E_RESPONSE,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element response = new Element(E_RESPONSE, DAV_NAMESPACE);
- Element href = new Element(E_HREF,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element href = new Element(E_HREF, DAV_NAMESPACE);
href.setText(HTTP_PROTOCOL +
getRequest().getServerName()+ ":" +
getRequest().getServerPort() +
getRequest().getContextPath() +
requestUri);
response.addContent(href);
- Element propStat = new Element(E_PROPSTAT,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element propStat = new Element(E_PROPSTAT, DAV_NAMESPACE);
response.addContent(propStat);
- Element status = new Element(E_STATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element status = new Element(E_STATUS, DAV_NAMESPACE);
status.setText(HTTP_VERSION + " " + errorCode + " " +
WebdavStatus.getStatusText(errorCode));
propStat.addContent(status);
if (condition != null) {
- Element responseDescriptiont = new Element(E_RESPONSEDESCRIPTION,
Namespace.getNamespace(DEFAULT_NAMESPACE));
- Element errorElement = new Element(E_ERROR,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element responseDescriptiont = new Element(E_RESPONSEDESCRIPTION,
DAV_NAMESPACE);
+ Element errorElement = new Element(E_ERROR, DAV_NAMESPACE);
responseDescriptiont.addContent(errorElement);
- Element conditionElement = new Element(condition,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element conditionElement = new Element(condition, DAV_NAMESPACE);
errorElement.addContent(conditionElement);
propStat.addContent(responseDescriptiont);
}
1.4 +14 -9
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java
Index: UpdateMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UpdateMethod.java 14 May 2002 15:33:43 -0000 1.3
+++ UpdateMethod.java 15 May 2002 11:44:38 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
1.3 2002/05/14 15:33:43 pnever Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/14 15:33:43 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
1.4 2002/05/15 11:44:38 juergen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/15 11:44:38 $
*
* ====================================================================
*
@@ -118,6 +118,12 @@
public class UpdateMethod extends AbstractMultistatusResponseMethod
implements DeltavConstants {
+ /**
+ * Constant for the <code>DAV:</code> namespace (with prefix <code>D</code>)
+ */
+ protected static final Namespace DAV_NAMESPACE =
Namespace.getNamespace(DEFAULT_PREFIX,
+
DEFAULT_NAMESPACE);
+
/** The update target */
private String resourcePath;
@@ -279,8 +285,7 @@
slideToken.setForceStoreEnlistment(true);
try {
- Element multistatusElement = new Element(E_MULTISTATUS,
-
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element multistatusElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
update(updateSourcePath, updateLabelName, resourcePath, getDepth(),
multistatusElement);
@@ -314,12 +319,12 @@
*/
protected void update(String updateSourcePath, String updateLabelName, String
resourcePath, int depth, Element multistatusElement) {
- Element responseElement = new Element(E_RESPONSE,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element responseElement = new Element(E_RESPONSE, DAV_NAMESPACE);
multistatusElement.addContent(responseElement);
- Element hrefElement = new Element(E_HREF,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element hrefElement = new Element(E_HREF, DAV_NAMESPACE);
hrefElement.setText(PropertyHelper.getAbsoluteURL(serverUri,
req.getContextPath(), resourcePath));
responseElement.addContent(hrefElement);
- Element statusElement = new Element(E_STATUS,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ Element statusElement = new Element(E_STATUS, DAV_NAMESPACE);
responseElement.addContent(statusElement);
Enumeration childrenEnum = null;
@@ -423,7 +428,7 @@
WebdavStatus.getStatusText(errorCode));
if (exception instanceof PreconditionViolationException) {
Element responseDescriptionElement = new Element(E_RESPONSEDESCRIPTION,
-
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ DAV_NAMESPACE);
responseElement.addContent(responseDescriptionElement);
Element errorElement =
getPreconditionViolationError(((PreconditionViolationException)exception).getViolatedPrecondition());
responseDescriptionElement.addContent(errorElement);
1.55 +5 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java
Index: WebdavMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- WebdavMethod.java 7 May 2002 13:05:44 -0000 1.54
+++ WebdavMethod.java 15 May 2002 11:44:38 -0000 1.55
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
1.54 2002/05/07 13:05:44 juergen Exp $
- * $Revision: 1.54 $
- * $Date: 2002/05/07 13:05:44 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
1.55 2002/05/15 11:44:38 juergen Exp $
+ * $Revision: 1.55 $
+ * $Date: 2002/05/15 11:44:38 $
*
* ====================================================================
*
@@ -584,7 +584,8 @@
*/
protected org.jdom.Element getPreconditionViolationError(ViolatedPrecondition
violatedPrecondition) {
return getPreconditionViolationError(violatedPrecondition,
-
org.jdom.Namespace.getNamespace(WebdavConstants.DEFAULT_NAMESPACE));
+
org.jdom.Namespace.getNamespace(WebdavConstants.DEFAULT_PREFIX,
+
WebdavConstants.DEFAULT_NAMESPACE));
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
