luetzkendorf 2004/07/13 02:28:40
Modified: src/webdav/server/org/apache/slide/webdav/method
PollMethod.java
Log:
some changes to satisfy the notification test cases
Revision Changes Path
1.8 +15 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PollMethod.java
Index: PollMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PollMethod.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PollMethod.java 4 May 2004 13:40:18 -0000 1.7
+++ PollMethod.java 13 Jul 2004 09:28:40 -0000 1.8
@@ -83,10 +83,10 @@
boolean noContent = false;
Element contentResponse = new Element(E_RESPONSE, DNSP);
int statusCode = WebdavStatus.SC_OK;
- generateStatusText(contentResponse, req.getRequestURL().toString(),
statusCode);
+ generateStatusText(contentResponse, requestUri, statusCode);
Element noContentResponse = new Element(E_RESPONSE, DNSP);
statusCode = WebdavStatus.SC_NO_CONTENT;
- generateStatusText(noContentResponse, req.getRequestURL().toString(),
statusCode);
+ generateStatusText(noContentResponse, requestUri, statusCode);
Element subscriptionIdContent = new Element(E_SUBSCRIPTION_ID, NNSP);
Element subscriptionIdNoContent = new Element(E_SUBSCRIPTION_ID, NNSP);
contentResponse.addContent(subscriptionIdContent);
@@ -115,7 +115,16 @@
for ( int k = 0; k < information.length; k++ ) {
Element entry = new Element(E_INFORMATION,
NNSP);
entry.setAttribute(A_INFORMATION_KEY,
information[k][0]);
-
entry.addContent(String.valueOf(information[k][1]));
+ // FIXME: if the information value is a Slide
URI, we
+ // have to add the slideContext
+ // FIXME: this should be generalized
+ if ("uri".equals(information[k][0])) {
+ entry.addContent(
+ getSlideContextPath() +
+ String.valueOf(information[k][1]));
+ } else {
+
entry.addContent(String.valueOf(information[k][1]));
+ }
eventElement.addContent(entry);
}
subscriptionIdContent.addContent(eventElement);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
