dflorey 2004/03/15 04:08:50
Modified: src/webdav/server/org/apache/slide/webdav/method
DefaultMethodFactory.java PollMethod.java
SubscribeMethod.java
Log:
Added missing UNSUBSCRIBE method
Revision Changes Path
1.9 +5 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DefaultMethodFactory.java
Index: DefaultMethodFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DefaultMethodFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultMethodFactory.java 4 Mar 2004 09:41:50 -0000 1.8
+++ DefaultMethodFactory.java 15 Mar 2004 12:08:50 -0000 1.9
@@ -94,6 +94,8 @@
return new ReportMethod(token, config);
} else if (name.equals("SUBSCRIBE")) {
return new SubscribeMethod(token, config);
+ } else if (name.equals("UNSUBSCRIBE")) {
+ return new UnsubscribeMethod(token, config);
} else if (name.equals("TRANSACTION")) {
return new TransactionMethod(token, config);
} else if (name.equals("POLL")) {
1.5 +8 -14
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PollMethod.java 15 Mar 2004 11:41:54 -0000 1.4
+++ PollMethod.java 15 Mar 2004 12:08:50 -0000 1.5
@@ -25,25 +25,23 @@
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.event.EventDispatcher;
-import org.apache.slide.event.EventCollection;
-import org.apache.slide.event.ResourceEvent;
import org.apache.slide.event.RemoteInformation;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
-import org.apache.slide.webdav.event.WebdavEvent;
import org.apache.slide.webdav.event.NotificationTrigger;
import org.apache.slide.webdav.event.Subscriber;
+import org.apache.slide.webdav.event.WebdavEvent;
import org.apache.slide.webdav.util.NotificationConstants;
import org.apache.util.WebdavStatus;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.Namespace;
-import org.jdom.Attribute;
+import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
-import java.util.List;
-import java.util.Iterator;
import java.util.EventObject;
+import java.util.Iterator;
+import java.util.List;
/**
* Poll Method.
@@ -54,13 +52,9 @@
protected final static String LOG_CHANNEL = PollMethod.class.getName();
protected final static Namespace NNSP = Namespace.getNamespace(N_PREFIX, N_URI);
- // An XML outputter
private XMLOutputter xmlOut;
- // ----------------------------------------------------------- Constructors
-
-
/**
* Constructor.
*
@@ -69,7 +63,7 @@
*/
public PollMethod(NamespaceAccessToken token, WebdavServletConfig config) {
super(token, config);
- org.jdom.output.Format format = org.jdom.output.Format.getPrettyFormat();
+ Format format = org.jdom.output.Format.getPrettyFormat();
format.setIndent(XML_RESPONSE_INDENT);
xmlOut = new XMLOutputter(format);
}
1.4 +3 -12
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SubscribeMethod.java
Index: SubscribeMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SubscribeMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SubscribeMethod.java 26 Feb 2004 15:45:54 -0000 1.3
+++ SubscribeMethod.java 15 Mar 2004 12:08:50 -0000 1.4
@@ -51,12 +51,6 @@
private final static int DEFAULT_SUBSCRIPTION_LIFETIME = 3600;
- // An XML outputter
- private XMLOutputter xmlOut;
-
- // ----------------------------------------------------------- Constructors
-
-
/**
* Constructor.
*
@@ -66,9 +60,6 @@
public SubscribeMethod(NamespaceAccessToken token,
WebdavServletConfig config) {
super(token, config);
- org.jdom.output.Format format = org.jdom.output.Format.getPrettyFormat();
- format.setIndent(XML_RESPONSE_INDENT);
- xmlOut = new XMLOutputter(format);
}
protected void parseRequest() throws WebdavException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
