juergen 02/05/17 04:54:33
Modified: src/webdav/server/org/apache/slide/webdav/method
AbstractMultistatusResponseMethod.java
LockMethod.java OptionsMethod.java
PropFindMethod.java ReportMethod.java
SearchMethod.java UpdateMethod.java
WebdavMethod.java
src/webdav/server/org/apache/slide/webdav/util
PropertySearchSetProperty.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.
(ralf)
Revision Changes Path
1.24 +9 -14
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractMultistatusResponseMethod.java 16 May 2002 07:39:24 -0000 1.23
+++ AbstractMultistatusResponseMethod.java 17 May 2002 11:54:32 -0000 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v
1.23 2002/05/16 07:39:24 juergen Exp $
- * $Revision: 1.23 $
- * $Date: 2002/05/16 07:39:24 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v
1.24 2002/05/17 11:54:32 juergen Exp $
+ * $Revision: 1.24 $
+ * $Date: 2002/05/17 11:54:32 $
*
* ====================================================================
*
@@ -74,6 +74,7 @@
import org.apache.slide.macro.*;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.structure.*;
import org.apache.slide.webdav.util.WebdavUtils;
@@ -98,12 +99,6 @@
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
@@ -243,13 +238,13 @@
protected String generateErrorMessage
(NestedSlideException nestedException) {
- Element multistatus = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ Element multistatus = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
Enumeration nestedExceptionsList =
nestedException.enumerateExceptions();
while (nestedExceptionsList.hasMoreElements()) {
- Element response = new Element(E_RESPONSE, DAV_NAMESPACE);
+ Element response = new Element(E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
multistatus.addContent(response);
SlideException ex =
(SlideException) nestedExceptionsList.nextElement();
@@ -282,10 +277,10 @@
*/
protected void generateStatusText(Element parentElement, String href, int
statusCode) {
- Element hrefElement = new Element(E_HREF, DAV_NAMESPACE);
+ Element hrefElement = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
parentElement.addContent(hrefElement);
hrefElement.setText(WebdavUtils.encodeURL(href));
- Element statusElement = new Element(E_STATUS, DAV_NAMESPACE);
+ Element statusElement = new Element(E_STATUS,
NamespaceCache.DEFAULT_NAMESPACE);
parentElement.addContent(statusElement);
statusElement.setText("HTTP/1.1 " + statusCode + " "
+ WebdavStatus.getStatusText(statusCode));
@@ -302,7 +297,7 @@
*/
protected Element
getPreconditionViolationResponseDescription(PreconditionViolationException pve) {
- Element responseDescription = new Element(E_RESPONSEDESCRIPTION,
DAV_NAMESPACE);
+ Element responseDescription = new Element(E_RESPONSEDESCRIPTION,
NamespaceCache.DEFAULT_NAMESPACE);
responseDescription.addContent(getPreconditionViolationError(pve.getViolatedPrecondition()));
return responseDescription;
}
1.34 +6 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- LockMethod.java 17 May 2002 05:54:32 -0000 1.33
+++ LockMethod.java 17 May 2002 11:54:32 -0000 1.34
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.33 2002/05/17 05:54:32 juergen Exp $
- * $Revision: 1.33 $
- * $Date: 2002/05/17 05:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.34 2002/05/17 11:54:32 juergen Exp $
+ * $Revision: 1.34 $
+ * $Date: 2002/05/17 11:54:32 $
*
* ====================================================================
*
@@ -80,6 +80,7 @@
import org.apache.slide.macro.*;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.structure.*;
@@ -658,8 +659,8 @@
throws WebdavException {
// Generating XML response
- org.jdom.Element prop = new org.jdom.Element(E_PROP, DAV_NAMESPACE);
- org.jdom.Element lockdiscovery = new org.jdom.Element(E_LOCKDISCOVERY,
DAV_NAMESPACE);
+ org.jdom.Element prop = new org.jdom.Element(E_PROP,
NamespaceCache.DEFAULT_NAMESPACE);
+ org.jdom.Element lockdiscovery = new org.jdom.Element(E_LOCKDISCOVERY,
NamespaceCache.DEFAULT_NAMESPACE);
prop.addContent(lockdiscovery);
XMLValue xmlValue = propertyHelper.computeLockDiscovery(token,
serverURL,
1.23 +5 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- OptionsMethod.java 17 May 2002 05:54:32 -0000 1.22
+++ OptionsMethod.java 17 May 2002 11:54:32 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
1.22 2002/05/17 05:54:32 juergen Exp $
- * $Revision: 1.22 $
- * $Date: 2002/05/17 05:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
1.23 2002/05/17 11:54:32 juergen Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/05/17 11:54:32 $
*
* ====================================================================
*
@@ -77,6 +77,7 @@
import org.apache.slide.lock.*;
import org.apache.slide.search.*;
import org.apache.slide.content.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.util.Configuration;
import org.apache.slide.webdav.util.UriHandler;
import org.apache.slide.webdav.util.HistoryPathHandler;
@@ -104,7 +105,7 @@
// An XML outputter
private XMLOutputter xmlOut = new XMLOutputter(XML_REPONSE_INDENT, true,
"UTF-8" );
- private Namespace xmlNs = Namespace.getNamespace(DEFAULT_PREFIX,
DEFAULT_NAMESPACE);
+ private Namespace xmlNs = NamespaceCache.DEFAULT_NAMESPACE;
// private Namespace xmlNs = Namespace.getNamespace(DEFAULT_NAMESPACE);
// the collections which may contain VH or workspace resources are requested
1.72 +18 -23
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.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- PropFindMethod.java 17 May 2002 05:54:32 -0000 1.71
+++ PropFindMethod.java 17 May 2002 11:54:32 -0000 1.72
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.71 2002/05/17 05:54:32 juergen Exp $
- * $Revision: 1.71 $
- * $Date: 2002/05/17 05:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.72 2002/05/17 11:54:32 juergen Exp $
+ * $Revision: 1.72 $
+ * $Date: 2002/05/17 11:54:32 $
*
* ====================================================================
*
@@ -79,6 +79,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.security.NodePermission;
import org.apache.slide.security.Security;
import org.apache.slide.webdav.util.VersioningHelper;
@@ -140,12 +141,6 @@
*/
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
@@ -360,7 +355,7 @@
resp.setContentType("text/xml; charset=UTF-8");
// Create multistatus object
- Element multistatusElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ Element multistatusElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
if (resource != null) {
if (depth == 0) {
@@ -446,7 +441,7 @@
return getErrorResponse(resourceUri, getErrorCode(e), null);
}
- Element responseElement = new Element(E_RESPONSE, DAV_NAMESPACE);
+ Element responseElement = new Element(E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
String status = new String(HTTP_VERSION + WebdavStatus.SC_OK + " "
+ WebdavStatus.getStatusText
@@ -460,7 +455,7 @@
String serverURL = HTTP_PROTOCOL + req.getServerName()+ ":" +
req.getServerPort();
try {
- Element hrefElement = new Element(E_HREF, DAV_NAMESPACE);
+ Element hrefElement = new Element(E_HREF,
NamespaceCache.DEFAULT_NAMESPACE);
VersioningHelper vHelp = VersioningHelper.getVersioningHelper(
slideToken, token, req, resp, getConfig() );
@@ -546,9 +541,9 @@
+ " " + WebdavStatus.getStatusText
(WebdavStatus.SC_OK));
- Element propstatElement = new Element(E_PROPSTAT, DAV_NAMESPACE);
+ Element propstatElement = new Element(E_PROPSTAT,
NamespaceCache.DEFAULT_NAMESPACE);
responseElement.addContent(propstatElement);
- Element propElement = new Element(E_PROPSTAT, DAV_NAMESPACE);
+ Element propElement = new Element(E_PROPSTAT,
NamespaceCache.DEFAULT_NAMESPACE);
propstatElement.addContent(propElement);
ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, object.getUri(), revisionDescriptor);
@@ -570,10 +565,10 @@
Iterator iterator = propertySet.iterator();
while (iterator.hasNext()) {
- Element propertyElement = new
Element(iterator.next().toString(), DAV_NAMESPACE);
+ Element propertyElement = new
Element(iterator.next().toString(), NamespaceCache.DEFAULT_NAMESPACE);
propElement.addContent(propertyElement);
}
- Element statusElement = new Element(E_STATUS, DAV_NAMESPACE);
+ Element statusElement = new Element(E_STATUS,
NamespaceCache.DEFAULT_NAMESPACE);
propElement.addContent(statusElement);
break;
}
@@ -592,27 +587,27 @@
*/
private Element getErrorResponse(String resourcePath, int errorCode, String
condition) {
- Element response = new Element(E_RESPONSE, DAV_NAMESPACE);
+ Element response = new Element(E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
- Element href = new Element(E_HREF, DAV_NAMESPACE);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
href.setText(HTTP_PROTOCOL +
req.getServerName()+ ":" +
req.getServerPort() +
req.getContextPath() +
resourcePath);
response.addContent(href);
- Element propStat = new Element(E_PROPSTAT, DAV_NAMESPACE);
+ Element propStat = new Element(E_PROPSTAT,
NamespaceCache.DEFAULT_NAMESPACE);
response.addContent(propStat);
- Element status = new Element(E_STATUS, DAV_NAMESPACE);
+ Element status = new Element(E_STATUS, NamespaceCache.DEFAULT_NAMESPACE);
status.setText(HTTP_VERSION + " " + errorCode + " " +
WebdavStatus.getStatusText(errorCode));
propStat.addContent(status);
if (condition != null) {
- Element responseDescriptiont = new Element(E_RESPONSEDESCRIPTION,
DAV_NAMESPACE);
- Element errorElement = new Element(E_ERROR, DAV_NAMESPACE);
+ Element responseDescriptiont = new Element(E_RESPONSEDESCRIPTION,
NamespaceCache.DEFAULT_NAMESPACE);
+ Element errorElement = new Element(E_ERROR,
NamespaceCache.DEFAULT_NAMESPACE);
responseDescriptiont.addContent(errorElement);
- Element conditionElement = new Element(condition, DAV_NAMESPACE);
+ Element conditionElement = new Element(condition,
NamespaceCache.DEFAULT_NAMESPACE);
errorElement.addContent(conditionElement);
propStat.addContent(responseDescriptiont);
}
1.31 +47 -51
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ReportMethod.java 17 May 2002 05:54:32 -0000 1.30
+++ ReportMethod.java 17 May 2002 11:54:32 -0000 1.31
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.30 2002/05/17 05:54:32 juergen Exp $
- * $Revision: 1.30 $
- * $Date: 2002/05/17 05:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.31 2002/05/17 11:54:32 juergen Exp $
+ * $Revision: 1.31 $
+ * $Date: 2002/05/17 11:54:32 $
*
* ====================================================================
*
@@ -114,6 +114,7 @@
import org.apache.slide.common.SlideToken;
import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeRevisionNumber;
@@ -167,7 +168,7 @@
/**
* An implementation of the DeltaV <code>REPORT</code> method.
*
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -204,11 +205,6 @@
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;
@@ -573,38 +569,38 @@
Element resultElement = null;
try {
if (R_VERSION_TREE.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ resultElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeVersionTreeReport(requestUri, resultElement, getDepth());
}
else if (R_EXPAND_PROPERTY.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ resultElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeExpandPropertyReport(requestUri, resultElement, getDepth());
}
else if (R_ACL_PRINCIPAL_PROPS.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ resultElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeAclPrincipalReport(requestUri, resultElement, getDepth());
}
else if (R_PRINCIPAL_MATCH.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ resultElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_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,
DAV_NAMESPACE);
+ resultElement = new Element(R_PRINCIPAL_SEARCH_PROPERTY_SET,
NamespaceCache.DEFAULT_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_OK);
executePrincipalSearchPropertySetReport (requestUri, resultElement);
}
else if (R_PRINCIPAL_PROPERTY_SEARCH.equals(requestedReport)) {
- //resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ //resultElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_OK);
resultElement = executePrincipalSearchPropertyReport (getDepth());
}
else if (R_LOCATE_BY_HISTORY.equals(requestedReport)) {
- resultElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ resultElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
getResponse().setStatus(WebdavStatus.SC_MULTI_STATUS);
executeLocateByHistoryReport(requestUri, resultElement, getDepth());
}
@@ -801,9 +797,9 @@
*/
private Element getResponseElement(String slideUri, NodeRevisionDescriptors
revisionDescriptors, NodeRevisionNumber revisionNumber, SlideToken slideToken, String
requestUri, RequestedProperties requestedProperties) throws JDOMException {
- Element response = new Element(E_RESPONSE, DAV_NAMESPACE);
+ Element response = new Element(E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
- Element href = new Element(E_HREF, DAV_NAMESPACE);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
String serverURL = HTTP_PROTOCOL + req.getServerName()+ ":" +
req.getServerPort();
href.setText(serverURL + req.getContextPath() + requestUri);
response.addContent(href);
@@ -841,7 +837,7 @@
* @throws JDOMException
*/
protected void executeExpandPropertyReport(String requestUri, Element
parentElement, int depth) throws WebdavException, ObjectLockedException,
RevisionDescriptorNotFoundException, ServiceAccessException,
LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException,
JDOMException {
- List requestedPropertyElementList =
expandPropertyElement.getChildren(E_PROPERTY,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ List requestedPropertyElementList =
expandPropertyElement.getChildren(E_PROPERTY, NamespaceCache.DEFAULT_NAMESPACE);
writeExpandPropertyReport(requestUri, parentElement,
requestedPropertyElementList);
}
@@ -878,9 +874,9 @@
// get acl
// create virtuel ACL property object
- Element aclproperty = new Element(E_PROPERTY, DAV_NAMESPACE);
+ Element aclproperty = new Element(E_PROPERTY,
NamespaceCache.DEFAULT_NAMESPACE);
aclproperty.setAttribute(PARAM_NAME,P_ACL);
- Element prop = new Element(E_PROP, DAV_NAMESPACE);
+ Element prop = new Element(E_PROP, NamespaceCache.DEFAULT_NAMESPACE);
prop.addContent(aclproperty);
RequestedPropertiesImpl reqProperties = new RequestedPropertiesImpl(prop);
@@ -931,24 +927,24 @@
Iterator iterator = propstatList.iterator();
aclpropstat = ((Element)iterator.next());
- aclprops = aclpropstat.getChild(E_PROP, DAV_NAMESPACE);
+ aclprops = aclpropstat.getChild(E_PROP, NamespaceCache.DEFAULT_NAMESPACE);
if (aclprops != null) {
- acl = aclprops.getChild(P_ACL, DAV_NAMESPACE);
+ acl = aclprops.getChild(P_ACL, NamespaceCache.DEFAULT_NAMESPACE);
} else return;
if (aclprops != null) {
- acl = aclprops.getChild(P_ACL, DAV_NAMESPACE);
+ acl = aclprops.getChild(P_ACL, NamespaceCache.DEFAULT_NAMESPACE);
} else return;
- aces = acl.getChildren(P_ACE, DAV_NAMESPACE);
+ aces = acl.getChildren(P_ACE, NamespaceCache.DEFAULT_NAMESPACE);
// get Principals
Iterator aceIter = aces.iterator();
Element current = null;
while (aceIter.hasNext()) {
- current = ((Element) aceIter.next()).getChild(K_PRINCIPAL,
DAV_NAMESPACE).getChild(E_HREF, DAV_NAMESPACE);
+ current = ((Element) aceIter.next()).getChild(K_PRINCIPAL,
NamespaceCache.DEFAULT_NAMESPACE).getChild(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
if (current != null){
principals.add(current.getText());
}
@@ -1087,7 +1083,7 @@
uri = resource.getInternalHref();
if (!self) {
try {
- uri = (String) resource.getThisValue("owner",
DEFAULT_NAMESPACE);
+ uri = (String) resource.getThisValue("owner",
NamespaceCache.DEFAULT_URI);
if (uri != null) {
if (!(userpath.endsWith("/"))) userpath = userpath + "/";
uri = new String (userpath + uri);
@@ -1121,7 +1117,7 @@
*/
protected Element executePrincipalSearchPropertyReport(int depth) throws
WebdavException, SlideException, JDOMException {
- Element parentElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ Element parentElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
SearchQueryResult queryResult = null;
Iterator searchPropIter = null;
Element currentSearchProperty = null;
@@ -1134,8 +1130,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, DAV_NAMESPACE);
- principalCollectionSetElement.addContent(new
Element(E_PRINCIPAL_COLLECTION_SET, DAV_NAMESPACE));
+ Element principalCollectionSetElement = new Element(E_PROP,
NamespaceCache.DEFAULT_NAMESPACE);
+ principalCollectionSetElement.addContent(new
Element(E_PRINCIPAL_COLLECTION_SET, NamespaceCache.DEFAULT_NAMESPACE));
RequestedProperties collectionSetProp = new
RequestedPropertiesImpl(principalCollectionSetElement);
List collectionSets = retrieveProperties(requestUri, collectionSetProp);
Iterator collectionSetsIter = collectionSets.iterator();
@@ -1185,21 +1181,21 @@
Element currentPropertyElement = (Element) props.get(0);
currentSearchPropertyNamespace =
(currentPropertyElement.getNamespace()).getURI();
// set Namespace for property in query
- if (currentSearchPropertyNamespace.equals(DEFAULT_NAMESPACE)) {
- currentSearchPropertyName = C_PROP_OPEN + "<" +
DEFAULT_PREFIX + ":" + currentPropertyElement.getName() + "/>" + C_PROP_CLOSE;
+ if
(currentSearchPropertyNamespace.equals(NamespaceCache.DEFAULT_URI)) {
+ currentSearchPropertyName = C_PROP_OPEN + "<" +
NamespaceCache.DEFAULT_PREFIX + ":" + currentPropertyElement.getName() + "/>" +
C_PROP_CLOSE;
} else {
currentSearchPropertyName = C_PROP_OPEN_NS_OPEN +
currentSearchPropertyNamespace +
C_PROP_OPEN_NS_CLOSE + "<" + C_X_PREFIX +
currentPropertyElement.getName() + "/>" + C_PROP_CLOSE;
}
if
(!(PropertySearchSetProperty.inSearchPropertySet(currentPropertyElement.getName(),
currentSearchPropertyNamespace))) {
- parentElement = new Element(E_NON_SEARCHABLE_PROPERTY,
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ parentElement = new Element(E_NON_SEARCHABLE_PROPERTY,
NamespaceCache.DEFAULT_NAMESPACE);
parentElement.addContent((Element)element.clone());
resp.setStatus(WebdavStatus.SC_FORBIDDEN);
return parentElement;
}
}
else if (E_ALLPROP.equals(element.getName())) {
- parentElement = new Element("non-searchable-property",
Namespace.getNamespace(DEFAULT_NAMESPACE));
+ parentElement = new Element("non-searchable-property",
NamespaceCache.DEFAULT_NAMESPACE);
parentElement.addContent((Element)element.clone());
resp.setStatus(WebdavStatus.SC_FORBIDDEN);
return parentElement;
@@ -1265,10 +1261,10 @@
List propList = null;
String serverURL = "http://"; + req.getServerName()+ ":" +
req.getServerPort();
PropertyRetriever retriever = new PropertyRetrieverImpl(token, slideToken);
- org.jdom.Element responseElement = new org.jdom.Element (E_RESPONSE,
DAV_NAMESPACE);
+ org.jdom.Element responseElement = new org.jdom.Element (E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
parentElement.addContent (responseElement);
- org.jdom.Element hrefElement = new org.jdom.Element (E_HREF, DAV_NAMESPACE);
+ org.jdom.Element hrefElement = new org.jdom.Element (E_HREF,
NamespaceCache.DEFAULT_NAMESPACE);
hrefElement.addContent(PropertyHelper.getAbsoluteURL(serverURL,
req.getContextPath(), currentIntUrl));
responseElement.addContent (hrefElement);
@@ -1338,12 +1334,12 @@
// write result
while (propertiesIter.hasNext()) {
currentProperty = (PropertySearchSetProperty) propertiesIter.next();
- Element searchProp = new Element(E_PRINCIPAL_SEARCH_PROPERTY,
DAV_NAMESPACE );
- Element prop = new Element (E_PROP, DAV_NAMESPACE );
+ Element searchProp = new Element(E_PRINCIPAL_SEARCH_PROPERTY,
NamespaceCache.DEFAULT_NAMESPACE );
+ Element prop = new Element (E_PROP, NamespaceCache.DEFAULT_NAMESPACE );
Element propContent = new Element
(currentProperty.getPropertyName(),currentProperty.getNamespace());
- Element description = new Element (E_DESCRIPTION, DAV_NAMESPACE );
+ Element description = new Element (E_DESCRIPTION,
NamespaceCache.DEFAULT_NAMESPACE );
Attribute lang = new Attribute ("xml:lang","en");
- // Element descContent = new Element (currentDesc,
DAV_NAMESPACE);
+ // Element descContent = new Element (currentDesc,
NamespaceCache.DEFAULT_NAMESPACE);
description.setAttribute(lang);
description.addContent(currentProperty.getDescription());
prop.addContent(propContent);
@@ -1415,10 +1411,10 @@
if (childPropertyList.size() > 0) {
try {
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);
+ getChild(E_PROPSTAT, NamespaceCache.DEFAULT_NAMESPACE).
+ getChild(E_PROP, NamespaceCache.DEFAULT_NAMESPACE).
+
getChild(propertyElement.getAttribute("name").getValue(),
NamespaceCache.DEFAULT_NAMESPACE).
+ getChild(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
if (hrefElement.getText() != null) {
// replace the <href> with <response> of the
corresponding resource
@@ -1620,27 +1616,27 @@
*/
private Element getErrorResponse(String requestUri, int errorCode, String
condition) {
- Element response = new Element(E_RESPONSE, DAV_NAMESPACE);
+ Element response = new Element(E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
- Element href = new Element(E_HREF, DAV_NAMESPACE);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
href.setText(HTTP_PROTOCOL +
getRequest().getServerName()+ ":" +
getRequest().getServerPort() +
getRequest().getContextPath() +
requestUri);
response.addContent(href);
- Element propStat = new Element(E_PROPSTAT, DAV_NAMESPACE);
+ Element propStat = new Element(E_PROPSTAT,
NamespaceCache.DEFAULT_NAMESPACE);
response.addContent(propStat);
- Element status = new Element(E_STATUS, DAV_NAMESPACE);
+ Element status = new Element(E_STATUS, NamespaceCache.DEFAULT_NAMESPACE);
status.setText(HTTP_VERSION + " " + errorCode + " " +
WebdavStatus.getStatusText(errorCode));
propStat.addContent(status);
if (condition != null) {
- Element responseDescriptiont = new Element(E_RESPONSEDESCRIPTION,
DAV_NAMESPACE);
- Element errorElement = new Element(E_ERROR, DAV_NAMESPACE);
+ Element responseDescriptiont = new Element(E_RESPONSEDESCRIPTION,
NamespaceCache.DEFAULT_NAMESPACE);
+ Element errorElement = new Element(E_ERROR,
NamespaceCache.DEFAULT_NAMESPACE);
responseDescriptiont.addContent(errorElement);
- Element conditionElement = new Element(condition, DAV_NAMESPACE);
+ Element conditionElement = new Element(condition,
NamespaceCache.DEFAULT_NAMESPACE);
errorElement.addContent(conditionElement);
propStat.addContent(responseDescriptiont);
}
1.20 +13 -17
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java
Index: SearchMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SearchMethod.java 17 May 2002 10:39:41 -0000 1.19
+++ SearchMethod.java 17 May 2002 11:54:32 -0000 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
1.19 2002/05/17 10:39:41 wam Exp $
- * $Revision: 1.19 $
- * $Date: 2002/05/17 10:39:41 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
1.20 2002/05/17 11:54:32 juergen Exp $
+ * $Revision: 1.20 $
+ * $Date: 2002/05/17 11:54:32 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
//import org.apache.slide.lock.LockTokenNotFoundException;
//import org.apache.slide.lock.ObjectLockedException;
//import org.apache.slide.security.AccessDeniedException;
-//import org.apache.slide.content.RevisionDescriptorNotFoundException;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.structure.StructureException;
//import org.apache.slide.structure.LinkedObjectNotFoundException;
//import org.apache.slide.structure.ObjectNotFoundException;
@@ -121,11 +121,6 @@
*/
public class SearchMethod extends WebdavMethod implements WebdavConstants {
- /**
- * 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);
// ----------------------------------------------------- Instance variables
@@ -384,7 +379,7 @@
int errorStatus = webdavStatus;
org.jdom.Element rootElement =
- new org.jdom.Element (E_MULTISTATUS, DAV_NAMESPACE);
+ new org.jdom.Element (E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
responseDoc = new org.jdom.Document (rootElement);
@@ -393,11 +388,11 @@
while (it.hasNext()) {
org.jdom.Element responseElement =
- new org.jdom.Element (E_RESPONSE, DAV_NAMESPACE);
+ new org.jdom.Element (E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
rootElement.addContent (responseElement);
org.jdom.Element hrefElement =
- new org.jdom.Element (E_HREF, DAV_NAMESPACE);
+ new org.jdom.Element (E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
RequestedResource resource = (RequestedResource)it.next();
String internalUri = resource.getInternalHref();
@@ -460,15 +455,15 @@
}
org.jdom.Element responseElement =
- new org.jdom.Element (E_RESPONSE, DAV_NAMESPACE);
+ new org.jdom.Element (E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
org.jdom.Element hrefElement =
- new org.jdom.Element (E_HREF, DAV_NAMESPACE);
+ new org.jdom.Element (E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
hrefElement.addContent (href);
org.jdom.Element statusElement =
- new org.jdom.Element (E_STATUS, DAV_NAMESPACE);
+ new org.jdom.Element (E_STATUS,
NamespaceCache.DEFAULT_NAMESPACE);
statusElement.addContent (getStatusText (errorStatus));
responseElement.addContent (hrefElement);
@@ -478,7 +473,7 @@
if (description != null) {
org.jdom.Element responseDescriptionElement =
new org.jdom.Element (E_RESPONSEDESCRIPTION,
- DAV_NAMESPACE);
+ NamespaceCache.DEFAULT_NAMESPACE);
responseDescriptionElement.addContent (description);
responseElement.addContent (responseDescriptionElement);
@@ -487,7 +482,7 @@
if (status == SearchQueryResult.STATUS_INVALID_SCOPE) {
responseElement.addContent (
new org.jdom.Element ("scopeerror",
- DAV_NAMESPACE));
+ NamespaceCache.DEFAULT_NAMESPACE));
}
rootElement.addContent (responseElement);
}
@@ -507,4 +502,5 @@
}
}
}
+
1.6 +9 -14
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UpdateMethod.java 17 May 2002 05:54:32 -0000 1.5
+++ UpdateMethod.java 17 May 2002 11:54:32 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
1.5 2002/05/17 05:54:32 juergen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/17 05:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
1.6 2002/05/17 11:54:32 juergen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/17 11:54:32 $
*
* ====================================================================
*
@@ -86,6 +86,7 @@
import org.apache.slide.structure.SubjectNode;
import org.apache.slide.structure.ObjectNode;
import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
@@ -118,12 +119,6 @@
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;
@@ -285,7 +280,7 @@
slideToken.setForceStoreEnlistment(true);
try {
- Element multistatusElement = new Element(E_MULTISTATUS, DAV_NAMESPACE);
+ Element multistatusElement = new Element(E_MULTISTATUS,
NamespaceCache.DEFAULT_NAMESPACE);
update(updateSourcePath, updateLabelName, resourcePath, getDepth(),
multistatusElement);
@@ -320,12 +315,12 @@
*/
protected void update(String updateSourcePath, String updateLabelName, String
resourcePath, int depth, Element multistatusElement) {
- Element responseElement = new Element(E_RESPONSE, DAV_NAMESPACE);
+ Element responseElement = new Element(E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
multistatusElement.addContent(responseElement);
- Element hrefElement = new Element(E_HREF, DAV_NAMESPACE);
+ Element hrefElement = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
hrefElement.setText(PropertyHelper.getAbsoluteURL(serverUri,
req.getContextPath(), resourcePath));
responseElement.addContent(hrefElement);
- Element statusElement = new Element(E_STATUS, DAV_NAMESPACE);
+ Element statusElement = new Element(E_STATUS,
NamespaceCache.DEFAULT_NAMESPACE);
responseElement.addContent(statusElement);
Enumeration childrenEnum = null;
@@ -429,7 +424,7 @@
WebdavStatus.getStatusText(errorCode));
if (exception instanceof PreconditionViolationException) {
Element responseDescriptionElement = new Element(E_RESPONSEDESCRIPTION,
- DAV_NAMESPACE);
+
NamespaceCache.DEFAULT_NAMESPACE);
responseElement.addContent(responseDescriptionElement);
Element errorElement =
getPreconditionViolationError(((PreconditionViolationException)exception).getViolatedPrecondition());
responseDescriptionElement.addContent(errorElement);
1.57 +5 -5
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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- WebdavMethod.java 17 May 2002 05:54:32 -0000 1.56
+++ WebdavMethod.java 17 May 2002 11:54:32 -0000 1.57
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
1.56 2002/05/17 05:54:32 juergen Exp $
- * $Revision: 1.56 $
- * $Date: 2002/05/17 05:54:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
1.57 2002/05/17 11:54:32 juergen Exp $
+ * $Revision: 1.57 $
+ * $Date: 2002/05/17 11:54:32 $
*
* ====================================================================
*
@@ -87,6 +87,7 @@
import org.apache.slide.authenticate.*;
import org.apache.slide.structure.*;
import org.apache.slide.content.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.lock.*;
import org.apache.slide.search.*;
import org.apache.slide.macro.*;
@@ -590,8 +591,7 @@
*/
protected org.jdom.Element getPreconditionViolationError(ViolatedPrecondition
violatedPrecondition) {
return getPreconditionViolationError(violatedPrecondition,
-
org.jdom.Namespace.getNamespace(WebdavConstants.DEFAULT_PREFIX,
-
WebdavConstants.DEFAULT_NAMESPACE));
+ NamespaceCache.DEFAULT_NAMESPACE);
}
/**
1.2 +5 -2
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertySearchSetProperty.java
Index: PropertySearchSetProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertySearchSetProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertySearchSetProperty.java 14 May 2002 14:16:07 -0000 1.1
+++ PropertySearchSetProperty.java 17 May 2002 11:54:33 -0000 1.2
@@ -61,10 +61,13 @@
*/
package org.apache.slide.webdav.util;
+
import java.util.HashMap;
import java.util.Collection;
import java.util.Iterator;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
+
public class PropertySearchSetProperty {
private static HashMap propertyMap = null;
@@ -120,7 +123,7 @@
trippleIndex = currentTripple.indexOf(",");
if (trippleIndex == -1) {
currentProp = currentTripple;
- namespace = WebdavConstants.DEFAULT_NAMESPACE;
+ namespace = NamespaceCache.DEFAULT_URI;
currentDesc = "";
}else {
String currentDouble = currentTripple.substring(trippleIndex+1);
@@ -151,7 +154,7 @@
}
String space;
if (namespace == null) {
- space = WebdavConstants.DEFAULT_NAMESPACE;
+ space = NamespaceCache.DEFAULT_URI;
} else {
space = namespace;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
