msmith 2002/10/22 22:35:09
Modified: src/webdav/server/org/apache/slide/webdav/method
PropFindMethod.java
Log:
Revert some local changes that shouldn't have been committed before.
Fix another bug where properties in a <D:propname/> request were all returned
as in the DAV: namespace, rather than in their actual namespaces.
Revision Changes Path
1.86 +13 -12
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.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- PropFindMethod.java 23 Oct 2002 04:43:07 -0000 1.85
+++ PropFindMethod.java 23 Oct 2002 05:35:09 -0000 1.86
@@ -568,7 +568,7 @@
case FIND_BY_PROPERTY :
try {
PropertyRetriever propertyRetriever = new
PropertyRetrieverImpl(token, slideToken);
- List propstatList=
propertyRetriever.getPropertiesOfObject(requestedProperties, revisionDescriptors,
revisionDescriptor, req, getConfig(), serverURL, allpropIncludesDeltav);
+ List propstatList=
propertyRetriever.getPropertiesOfObject(requestedProperties, revisionDescriptors,
revisionDescriptor, req.getContextPath(), serverURL, allpropIncludesDeltav);
Iterator iterator = propstatList.iterator();
while (iterator.hasNext()) {
responseElement.addContent((Element)iterator.next());
@@ -604,15 +604,13 @@
NodeProperty currentProperty =
(NodeProperty) propertyList.nextElement();
if (currentProperty != null) {
- propertySet.add(currentProperty.getName());
+ Element propertyElement = new Element(
+ currentProperty.getName(),
+ currentProperty.getNamespace());
+ propElement.addContent(propertyElement);
}
}
- Iterator iterator = propertySet.iterator();
- while (iterator.hasNext()) {
- Element propertyElement = new
Element(iterator.next().toString(), NamespaceCache.DEFAULT_NAMESPACE);
- propElement.addContent(propertyElement);
- }
Element statusElement = new Element(E_STATUS,
NamespaceCache.DEFAULT_NAMESPACE);
propElement.addContent(statusElement);
break;
@@ -635,8 +633,11 @@
Element response = new Element(E_RESPONSE,
NamespaceCache.DEFAULT_NAMESPACE);
Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
- String serverURL = HTTP_PROTOCOL + req.getServerName()+ ":" +
req.getServerPort();
- href.setText(serverURL + WebdavUtils.getAbsolutePath(resourcePath, req,
getConfig()));
+ href.setText(HTTP_PROTOCOL +
+ req.getServerName()+ ":" +
+ req.getServerPort() +
+ req.getContextPath() +
+ resourcePath);
response.addContent(href);
Element propStat = new Element(E_PROPSTAT,
NamespaceCache.DEFAULT_NAMESPACE);
response.addContent(propStat);
--
To unsubscribe, e-mail: <mailto:slide-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:slide-dev-help@;jakarta.apache.org>
