masonjm 2004/08/09 16:27:01
Modified: src/share/org/apache/slide/cluster
ClusterCacheRefresher.java
webdavclient/clientlib/src/java/org/apache/webdav/lib
NotificationListener.java
lib jakarta-slide-webdavlib-2.1b1.jar
Log:
NotificationListener.subscribe() now handles depth of DepthSupport.DEPTH_INFINITY as
a special case
Revision Changes Path
1.4 +2 -2
jakarta-slide/src/share/org/apache/slide/cluster/ClusterCacheRefresher.java
Index: ClusterCacheRefresher.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/cluster/ClusterCacheRefresher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClusterCacheRefresher.java 9 Aug 2004 23:11:34 -0000 1.3
+++ ClusterCacheRefresher.java 9 Aug 2004 23:27:00 -0000 1.4
@@ -38,6 +38,7 @@
import org.apache.slide.util.logger.Logger;
import org.apache.webdav.lib.NotificationListener;
import org.apache.webdav.lib.Subscriber;
+import org.apache.webdav.lib.methods.DepthSupport;
/**
* <h3>Description</h3>
@@ -208,8 +209,7 @@
final int pollInterval = node.getAttributeAsInt("poll-interval", 60000);
final boolean udp = node.getAttributeAsBoolean("udp", true);
final String uri = node.getAttribute("base-uri", "/");
- // TODO: This needs to be infinity. This is waiting on bug #30527
- final int depth = 1;
+ final int depth = DepthSupport.DEPTH_INFINITY;
final int lifetime = node.getAttributeAsInt("subscription-lifetime",
3600);
final int notificationDelay =
node.getAttributeAsInt("notification-delay", 0);
1.8 +5 -4
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/NotificationListener.java
Index: NotificationListener.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/NotificationListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NotificationListener.java 9 Aug 2004 15:02:18 -0000 1.7
+++ NotificationListener.java 9 Aug 2004 23:27:00 -0000 1.8
@@ -48,6 +48,7 @@
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.protocol.Protocol;
+import org.apache.webdav.lib.methods.DepthSupport;
import org.apache.webdav.lib.methods.XMLResponseMethodBase;
import org.apache.webdav.lib.util.XMLPrinter;
import org.xml.sax.InputSource;
@@ -178,7 +179,7 @@
}
subscribeMethod.addRequestHeader(SubscribeMethod.H_NOTIFICATION_DELAY,
String.valueOf(notificationDelay));
subscribeMethod.addRequestHeader(SubscribeMethod.H_SUBSCRIPTION_LIFETIME,
String.valueOf(lifetime));
- subscribeMethod.addRequestHeader(SubscribeMethod.H_DEPTH,
String.valueOf(depth));
+ subscribeMethod.addRequestHeader(SubscribeMethod.H_DEPTH, ((depth ==
DepthSupport.DEPTH_INFINITY ) ? "infinity" : String.valueOf(depth)));
try {
subscribeMethod.setDoAuthentication(true);
HttpState httpState = new HttpState();
1.3 +733 -792 jakarta-slide/lib/jakarta-slide-webdavlib-2.1b1.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
