You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by df...@apache.org on 2004/08/05 16:43:35 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter LogFilter.java XmlLogFilter.java
dflorey 2004/08/05 07:43:35
Modified: src/webdav/server/org/apache/slide/webdav/method
VersionControlMethod.java CheckinMethod.java
EventMethod.java PollMethod.java DeleteMethod.java
SubscribeMethod.java UncheckoutMethod.java
MkworkspaceMethod.java DefaultMethodFactory.java
CheckoutMethod.java SearchMethod.java
MkcolMethod.java GetMethod.java
src/webdav/server/org/apache/slide/webdav/event
WebdavEvent.java Subscriber.java
NotificationTrigger.java
src/webdav/server/org/apache/slide/webdav/util
ViolatedPrecondition.java VersioningHelper.java
UriHandler.java WebdavConstants.java
ComputedPropertyProvider.java
PropertyRetrieverImpl.java
PropertySearchSetProperty.java
DirectoryIndexGenerator.java AclConstants.java
LabeledRevisionNotFoundException.java
UnlockListenerImpl.java PropertyRetriever.java
WebdavUtils.java
src/webdav/server/org/apache/slide/webdav/util/resourcekind
DeltavCompliantImpl.java VersionHistoryImpl.java
VersionControlledCollectionImpl.java
WorkspaceImpl.java
CheckedInVersionControlledImpl.java
DeltavCompliantCollectionImpl.java VersionImpl.java
PrincipalImpl.java ResourceKind.java
CheckedOutVersionControlledImpl.java
DeltavCompliantUnmappedUrlImpl.java
VersionControlledConfigurationImpl.java
CheckedOutVersionControlledConfigurationImpl.java
CollectionVersionImpl.java
VersionControlledImpl.java WorkingImpl.java
CheckedOutImpl.java ActivityImpl.java
BaselineImpl.java VersionableImpl.java
AbstractResourceKind.java
src/webdav/server/org/apache/slide/webdav
WebdavException.java WebdavServletConfig.java
WebdavServlet.java
src/webdav/server/org/apache/slide/webdav/method/report
PrincipalSearchPropertySetReport.java
AclPrincipalPropSetReport.java
VersionTreeReport.java
PrincipalPropertySearchReport.java
LocateByHistoryReport.java AbstractReport.java
PrincipalMatchReport.java
src/webdav/server/org/apache/slide/webdav/logger
XByteBuffer.java XServletInputStreamFacade.java
src/webdav/server/org/apache/slide/webdav/filter
LogFilter.java XmlLogFilter.java
Log:
Added persistence for subscrptions
Revision Changes Path
1.31 +3 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java
Index: VersionControlMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/VersionControlMethod.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- VersionControlMethod.java 2 Aug 2004 16:36:01 -0000 1.30
+++ VersionControlMethod.java 5 Aug 2004 14:43:29 -0000 1.31
@@ -41,7 +41,6 @@
import org.apache.slide.webdav.util.WebdavStatus;
import org.jdom.Element;
import org.jdom.JDOMException;
-
/**
* VERSION-CONTROL method.
*
1.29 +6 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckinMethod.java
Index: CheckinMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckinMethod.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CheckinMethod.java 2 Aug 2004 16:36:01 -0000 1.28
+++ CheckinMethod.java 5 Aug 2004 14:43:29 -0000 1.29
@@ -24,17 +24,18 @@
import java.io.IOException;
import java.util.Iterator;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.event.WebdavEvent;
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.VersioningHelper;
-import org.apache.slide.webdav.util.WebdavUtils;
-import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
import org.jdom.Element;
import org.jdom.JDOMException;
1.4 +7 -7 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/EventMethod.java
Index: EventMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/EventMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EventMethod.java 2 Aug 2004 16:36:01 -0000 1.3
+++ EventMethod.java 5 Aug 2004 14:43:29 -0000 1.4
@@ -23,6 +23,10 @@
package org.apache.slide.webdav.method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.event.EventDispatcher;
import org.apache.slide.event.GenericEvent;
@@ -32,10 +36,6 @@
import org.apache.slide.webdav.util.NotificationConstants;
import org.apache.slide.webdav.util.WebdavStatus;
import org.jdom.Element;
-
-import java.util.List;
-import java.util.Iterator;
-import java.util.ArrayList;
/**
1.11 +8 -8 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PollMethod.java 2 Aug 2004 16:36:01 -0000 1.10
+++ PollMethod.java 5 Aug 2004 14:43:29 -0000 1.11
@@ -23,6 +23,10 @@
package org.apache.slide.webdav.method;
+import java.util.EventObject;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.event.EventDispatcher;
import org.apache.slide.event.RemoteInformation;
@@ -39,10 +43,6 @@
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
-import java.util.EventObject;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Poll Method.
*
@@ -94,7 +94,7 @@
// sort subscribers by the occurance of events
Subscriber subscriber = NotificationTrigger.getInstance().getSubscriber(subscriptionID[i]);
if ( subscriber != null ) {
- NotificationTrigger.getInstance().refreshSubscriber(subscriber);
+ NotificationTrigger.getInstance().refreshSubscriber(subscriber, true);
List events = subscriber.getEvents();
if ( events.size() == 0 ) {
noContent = true;
1.37 +6 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java
Index: DeleteMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- DeleteMethod.java 2 Aug 2004 16:36:02 -0000 1.36
+++ DeleteMethod.java 5 Aug 2004 14:43:29 -0000 1.37
@@ -24,12 +24,14 @@
package org.apache.slide.webdav.method;
import java.io.IOException;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
+import org.apache.slide.event.EventDispatcher;
import org.apache.slide.macro.DeleteListener;
import org.apache.slide.macro.DeleteMacroException;
import org.apache.slide.structure.ObjectNotFoundException;
@@ -43,12 +45,11 @@
import org.apache.slide.webdav.util.UriHandler;
import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
+import org.apache.slide.webdav.util.WebdavStatus;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.CheckedOutVersionControlled;
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
import org.apache.slide.webdav.util.resourcekind.Working;
-import org.apache.slide.event.EventDispatcher;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.jdom.JDOMException;
/**
1.11 +5 -6 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SubscribeMethod.java 2 Aug 2004 16:36:01 -0000 1.10
+++ SubscribeMethod.java 5 Aug 2004 14:43:29 -0000 1.11
@@ -73,7 +73,7 @@
for ( int i = 0; i < subscriptionIDs.length; i++ ) {
Subscriber subscriber = NotificationTrigger.getInstance().getSubscriber(subscriptionIDs[i]);
if ( subscriber != null ) {
- NotificationTrigger.getInstance().refreshSubscriber(subscriber);
+ NotificationTrigger.getInstance().refreshSubscriber(subscriber, true);
}
}
} else {
@@ -83,8 +83,7 @@
} else {
// FIXME check for valid notification types
}
- Subscriber subscriber = new Subscriber(requestUri,
- contentType, callback, notificationType, notificationDelay,
+ Subscriber subscriber = new Subscriber(requestUri, callback, notificationType, notificationDelay,
subscriptionLifetime, depth);
int subscriptionID = NotificationTrigger.getInstance().addSubscriber(subscriber);
resp.setHeader(H_CALL_BACK, callback);
1.20 +5 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UncheckoutMethod.java
Index: UncheckoutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UncheckoutMethod.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- UncheckoutMethod.java 2 Aug 2004 16:36:01 -0000 1.19
+++ UncheckoutMethod.java 5 Aug 2004 14:43:29 -0000 1.20
@@ -23,15 +23,16 @@
package org.apache.slide.webdav.method;
import java.io.IOException;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.event.WebdavEvent;
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.VersioningHelper;
-import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.util.WebdavStatus;
import org.jdom.JDOMException;
1.13 +4 -3 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkworkspaceMethod.java
Index: MkworkspaceMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkworkspaceMethod.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MkworkspaceMethod.java 2 Aug 2004 16:36:01 -0000 1.12
+++ MkworkspaceMethod.java 5 Aug 2004 14:43:29 -0000 1.13
@@ -24,6 +24,7 @@
package org.apache.slide.webdav.method;
import java.io.IOException;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.webdav.WebdavException;
1.13 +4 -4 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultMethodFactory.java 28 Jul 2004 09:32:18 -0000 1.12
+++ DefaultMethodFactory.java 5 Aug 2004 14:43:29 -0000 1.13
@@ -24,11 +24,11 @@
package org.apache.slide.webdav.method;
import org.apache.slide.common.NamespaceAccessToken;
+import org.apache.slide.util.Configuration;
import org.apache.slide.webdav.WebdavMethod;
import org.apache.slide.webdav.WebdavMethodFactory;
import org.apache.slide.webdav.WebdavServlet;
import org.apache.slide.webdav.WebdavServletConfig;
-import org.apache.slide.util.Configuration;
/**
* The default factory for WebDAVMethod implementations.
1.33 +6 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckoutMethod.java
Index: CheckoutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckoutMethod.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- CheckoutMethod.java 2 Aug 2004 16:36:02 -0000 1.32
+++ CheckoutMethod.java 5 Aug 2004 14:43:29 -0000 1.33
@@ -24,9 +24,11 @@
import java.io.IOException;
import java.util.Iterator;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
+import org.apache.slide.event.EventDispatcher;
import org.apache.slide.util.Configuration;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
@@ -36,9 +38,8 @@
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.WebdavUtils;
-import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
import org.jdom.Element;
import org.jdom.JDOMException;
1.47 +5 -5 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- SearchMethod.java 2 Aug 2004 16:36:01 -0000 1.46
+++ SearchMethod.java 5 Aug 2004 14:43:29 -0000 1.47
@@ -30,6 +30,7 @@
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.RequestedProperties;
import org.apache.slide.common.SlideException;
+import org.apache.slide.event.EventDispatcher;
import org.apache.slide.search.BadGatewayException;
import org.apache.slide.search.BadQueryException;
import org.apache.slide.search.InvalidQueryException;
@@ -51,9 +52,8 @@
import org.apache.slide.webdav.util.PropertyRetriever;
import org.apache.slide.webdav.util.PropertyRetrieverImpl;
import org.apache.slide.webdav.util.WebdavConstants;
-import org.apache.slide.webdav.util.WebdavUtils;
-import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
1.37 +4 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java
Index: MkcolMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- MkcolMethod.java 3 Aug 2004 09:37:47 -0000 1.36
+++ MkcolMethod.java 5 Aug 2004 14:43:29 -0000 1.37
@@ -31,6 +31,7 @@
import org.apache.slide.common.SlideException;
import org.apache.slide.content.NodeProperty;
import org.apache.slide.content.NodeRevisionDescriptor;
+import org.apache.slide.event.EventDispatcher;
import org.apache.slide.structure.LinkedObjectNotFoundException;
import org.apache.slide.structure.ObjectAlreadyExistsException;
import org.apache.slide.structure.ObjectNotFoundException;
@@ -42,9 +43,7 @@
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.UriHandler;
import org.apache.slide.webdav.util.VersioningHelper;
-import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.util.WebdavStatus;
-
/**
* MKCOL method.
1.51 +7 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java
Index: GetMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- GetMethod.java 3 Aug 2004 14:58:23 -0000 1.50
+++ GetMethod.java 5 Aug 2004 14:43:29 -0000 1.51
@@ -30,9 +30,11 @@
import java.util.Enumeration;
import java.util.StringTokenizer;
import java.util.Vector;
+
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
@@ -41,6 +43,7 @@
import org.apache.slide.content.RevisionContentNotFoundException;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
import org.apache.slide.content.RevisionNotFoundException;
+import org.apache.slide.event.EventDispatcher;
import org.apache.slide.structure.LinkedObjectNotFoundException;
import org.apache.slide.util.Configuration;
import org.apache.slide.webdav.WebdavException;
@@ -51,9 +54,8 @@
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.WebdavUtils;
-import org.apache.slide.event.EventDispatcher;
import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
/**
* GET method.
1.6 +7 -7 jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/WebdavEvent.java
Index: WebdavEvent.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/WebdavEvent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebdavEvent.java 28 Jul 2004 09:32:51 -0000 1.5
+++ WebdavEvent.java 5 Aug 2004 14:43:30 -0000 1.6
@@ -23,12 +23,12 @@
package org.apache.slide.webdav.event;
+import java.util.EventListener;
+import java.util.EventObject;
+
import org.apache.slide.event.AbstractEventMethod;
import org.apache.slide.event.VetoException;
import org.apache.slide.event.VetoableEventMethod;
-
-import java.util.EventListener;
-import java.util.EventObject;
/**
* Webdav event class
1.11 +23 -9 jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/Subscriber.java
Index: Subscriber.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/Subscriber.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Subscriber.java 28 Jul 2004 09:32:51 -0000 1.10
+++ Subscriber.java 5 Aug 2004 14:43:30 -0000 1.11
@@ -23,14 +23,14 @@
package org.apache.slide.webdav.event;
-import org.apache.slide.event.ResourceEvent;
-import org.apache.slide.webdav.method.AbstractWebdavMethod;
-
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import java.util.TimerTask;
+import org.apache.slide.event.ResourceEvent;
+import org.apache.slide.webdav.method.AbstractWebdavMethod;
+
/**
* @version $Revision$
*/
@@ -45,14 +45,16 @@
private String callback;
private String notificationType, uri;
private int depth, notificationDelay, subscriptionLifetime, id;
+ private long subscriptionEnd;
private List events = new ArrayList();
private TimerTask lifetime, notify;
- public Subscriber(String uri, String contentType, String callback, String notificationType, int notificationDelay, int subscriptionLifetime, int depth) {
+ public Subscriber(String uri, String callback, String notificationType, int notificationDelay, int subscriptionLifetime, int depth) {
this.callback = callback;
this.notificationType = notificationType;
this.notificationDelay = notificationDelay;
this.subscriptionLifetime = subscriptionLifetime;
+ this.subscriptionEnd = System.currentTimeMillis() + subscriptionLifetime*1000;
this.uri = uri;
this.depth = depth;
}
@@ -73,6 +75,10 @@
return lifetime;
}
+ public long getSubscriptionEnd() {
+ return subscriptionEnd;
+ }
+
public void setLifetime(TimerTask lifetime) {
this.lifetime = lifetime;
}
@@ -85,7 +91,15 @@
this.notify = notify;
}
- public boolean matches(String type, ResourceEvent event) {
+ public int getDepth() {
+ return depth;
+ }
+
+ public String getUri() {
+ return uri;
+ }
+
+ public boolean matches(String type, ResourceEvent event) {
// check if event matches notification-type
// see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wss/wss/_webdav_notification_type_header.asp
// for details
1.13 +136 -11 jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/NotificationTrigger.java
Index: NotificationTrigger.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/NotificationTrigger.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NotificationTrigger.java 28 Jul 2004 09:32:53 -0000 1.12
+++ NotificationTrigger.java 5 Aug 2004 14:43:30 -0000 1.13
@@ -23,19 +23,47 @@
package org.apache.slide.webdav.event;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
import org.apache.commons.httpclient.HttpConnection;
import org.apache.commons.httpclient.HttpState;
import org.apache.slide.common.Domain;
-import org.apache.slide.event.*;
+import org.apache.slide.event.ContentEvent;
+import org.apache.slide.event.EventCollection;
+import org.apache.slide.event.EventCollectionFilter;
+import org.apache.slide.event.EventCollectionListener;
+import org.apache.slide.event.ResourceEvent;
+import org.apache.slide.event.VetoException;
import org.apache.slide.util.conf.Configurable;
import org.apache.slide.util.conf.Configuration;
import org.apache.slide.util.conf.ConfigurationException;
import org.apache.slide.util.logger.Logger;
import org.apache.slide.webdav.util.NotificationConstants;
+import org.xml.sax.InputSource;
+import org.xml.sax.helpers.AttributesImpl;
-import java.io.IOException;
-import java.net.*;
-import java.util.*;
+import de.zeigermann.xml.XMLEncode;
+import de.zeigermann.xml.XMLOutputStreamWriter;
+import de.zeigermann.xml.XMLWriter;
+import de.zeigermann.xml.simpleImporter.ConversionHelpers;
+import de.zeigermann.xml.simpleImporter.DefaultSimpleImportHandler;
+import de.zeigermann.xml.simpleImporter.SimpleImporter;
+import de.zeigermann.xml.simpleImporter.SimplePath;
/**
* @version $Revision$
@@ -43,15 +71,28 @@
public class NotificationTrigger implements NotificationConstants, EventCollectionListener, Configurable {
protected static final String LOG_CHANNEL = NotificationTrigger.class.getName();
private final static String A_INCLUDE_EVENTS = "include-events";
+ private final static String A_FILENAME = "filename";
+
private final static String TCP_PROTOCOL = "http://";
private final static String UDP_PROTOCOL = "httpu://";
+ private final static String E_SUBSCRIPTIONS = "subscriptions";
+ private final static String E_SUBSCRIPTION = "subscription";
+ private final static String A_ID = "id";
+ private final static String E_URI = "uri";
+ private final static String E_DEPTH = "depth";
+ private final static String E_NOTIFICATION_DELAY = "notification-delay";
+ private final static String E_NOTIFICATION_TYPE = "notification-type";
+ private final static String E_CALLBACK = "callback";
+ private final static String E_SUBSCRIPTION_END = "subscription-end";
+
protected static final Timer timer = new Timer();
protected List subscribers = new ArrayList();
protected int subscriberId = 0;
protected boolean includeEvents = false;
protected DatagramSocket socket;
+ protected String filename = null;
private static NotificationTrigger notificationTrigger = new NotificationTrigger();
@@ -74,17 +115,18 @@
subscriberId++;
subscriber.setId(subscriberId);
subscribers.add(subscriber);
- refreshSubscriber(subscriber);
+ refreshSubscriber(subscriber, true);
return subscriberId;
}
public boolean removeSubscriber(Subscriber subscriber) {
Domain.log("Removing subscriber with ID: "+subscriber.getId(), LOG_CHANNEL, Logger.INFO);
subscriber.getLifetime().cancel();
+ saveSubscribers();
return subscribers.remove(subscriber);
}
- public void refreshSubscriber(final Subscriber subscriber) {
+ public void refreshSubscriber(final Subscriber subscriber, boolean persist) {
TimerTask lifetimeTask = subscriber.getLifetime();
if ( lifetimeTask != null ) lifetimeTask.cancel();
if ( subscriber.getSubscriptionLifetime() > 0 ) {
@@ -92,12 +134,13 @@
TimerTask lifetime = new TimerTask() {
public void run() {
Domain.log("Removing subscriber with ID: "+subscriber.getId(), LOG_CHANNEL, Logger.INFO);
- subscribers.remove(subscriber);
+ refreshSubscriber(subscriber, true);
}
};
subscriber.setLifetime(lifetime);
timer.schedule(lifetime, subscriber.getSubscriptionLifetime()*1000);
}
+ if ( persist ) saveSubscribers();
}
public List getSubscribers() {
@@ -242,5 +285,87 @@
public void configure(Configuration configuration) throws ConfigurationException {
Configuration notification = configuration.getConfiguration("notification");
includeEvents = notification.getAttributeAsBoolean(A_INCLUDE_EVENTS, false);
+ Configuration persistSubscriptions = configuration.getConfiguration("persist-subscriptions");
+ if ( persistSubscriptions != null ) {
+ filename = persistSubscriptions.getAttribute(A_FILENAME);
+ }
+ loadSubscribers();
+ }
+
+ private void loadSubscribers() {
+ if ( filename != null ) {
+ synchronized ( subscribers ) {
+ File file = new File(filename);
+ if ( file.exists() ) {
+ try {
+ FileInputStream inputStream = new FileInputStream(filename);
+ SimpleImporter importer = new SimpleImporter();
+ importer.addSimpleImportHandler(new DefaultSimpleImportHandler() {
+ String callback, notificationType, uri;
+ int depth, notificationDelay, subscriptionLifetime, id;
+ List events = new ArrayList();
+
+ public void startElement(SimplePath path, String name, AttributesImpl attributes, String leadingCDdata) {
+ if ( path.matches(E_SUBSCRIPTION) ) {
+ id = ConversionHelpers.getInt(attributes.getValue(A_ID));
+ } else if ( path.matches(E_URI) ) {
+ uri = leadingCDdata;
+ } else if ( path.matches(E_DEPTH) ) {
+ depth = Integer.valueOf(leadingCDdata).intValue();
+ } else if ( path.matches(E_CALLBACK) ) {
+ callback = leadingCDdata;
+ } else if ( path.matches(E_NOTIFICATION_DELAY) ) {
+ notificationDelay = Integer.valueOf(leadingCDdata).intValue();
+ } else if ( path.matches(E_NOTIFICATION_TYPE) ) {
+ notificationType = leadingCDdata;
+ } else if ( path.matches(E_SUBSCRIPTION_END) ) {
+ subscriptionLifetime = (int)(Long.valueOf(leadingCDdata).longValue() - System.currentTimeMillis());
+ }
+ }
+
+ public void endElement(SimplePath path, String name) {
+ if ( path.matches(E_SUBSCRIPTION) ) {
+ Subscriber subscriber = new Subscriber(uri, callback, notificationType, notificationDelay, subscriptionLifetime, depth);
+ subscribers.add(subscriber);
+ refreshSubscriber(subscriber, false);
+ }
+ }
+ });
+ importer.parse(new InputSource(inputStream));
+ } catch (Exception e) {
+ Domain.log("Exception while restoring subscriptions. Skipping...");
+ }
+ }
+ }
+ }
+ }
+
+ private void saveSubscribers() {
+ if ( filename != null ) {
+ synchronized ( subscribers ) {
+ try {
+ FileOutputStream outputStream = new FileOutputStream(filename);
+ XMLOutputStreamWriter writer = new XMLOutputStreamWriter(outputStream);
+ writer.writeXMLDeclaration();
+ writer.writeStartTag(XMLWriter.createStartTag(E_SUBSCRIPTIONS));
+ for ( Iterator i = subscribers.iterator(); i.hasNext(); ) {
+ Subscriber subscriber = (Subscriber)i.next();
+ writer.writeStartTag(XMLWriter.createStartTag(E_SUBSCRIPTION, new String[][] {
+ { A_ID, String.valueOf(subscriber.getId()) } }));
+ writer.writeElementWithPCData(XMLWriter.createStartTag(E_URI), XMLEncode.xmlEncodeText(subscriber.getUri()), XMLWriter.createEndTag(E_URI));
+ writer.writeElementWithPCData(XMLWriter.createStartTag(E_DEPTH), String.valueOf(subscriber.getDepth()), XMLWriter.createEndTag(E_DEPTH));
+ writer.writeElementWithPCData(XMLWriter.createStartTag(E_CALLBACK), XMLEncode.xmlEncodeText(subscriber.getCallback()), XMLWriter.createEndTag(E_CALLBACK));
+ writer.writeElementWithPCData(XMLWriter.createStartTag(E_NOTIFICATION_TYPE), XMLEncode.xmlEncodeText(subscriber.getNotificationType()), XMLWriter.createEndTag(E_NOTIFICATION_TYPE));
+ writer.writeElementWithPCData(XMLWriter.createStartTag(E_NOTIFICATION_DELAY), String.valueOf(subscriber.getNotificationDelay()), XMLWriter.createEndTag(E_NOTIFICATION_DELAY));
+ writer.writeElementWithPCData(XMLWriter.createStartTag(E_SUBSCRIPTION_END), String.valueOf(subscriber.getSubscriptionEnd()), XMLWriter.createEndTag(E_SUBSCRIPTION_END));
+ writer.writeEndTag(XMLWriter.createEndTag(E_SUBSCRIPTION));
+ }
+ writer.writeEndTag(XMLWriter.createEndTag(E_SUBSCRIPTIONS));
+ outputStream.close();
+ } catch ( Exception e) {
+ Domain.log(e);
+ }
+ }
+ }
}
}
1.11 +4 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ViolatedPrecondition.java
Index: ViolatedPrecondition.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ViolatedPrecondition.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ViolatedPrecondition.java 2 Aug 2004 16:36:06 -0000 1.10
+++ ViolatedPrecondition.java 5 Aug 2004 14:43:30 -0000 1.11
@@ -23,7 +23,6 @@
package org.apache.slide.webdav.util;
// import list
-import org.apache.slide.webdav.util.WebdavStatus;
/**
* This class encapsulates the status code and name of the precondition
1.107 +8 -9 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- VersioningHelper.java 2 Aug 2004 16:36:06 -0000 1.106
+++ VersioningHelper.java 5 Aug 2004 14:43:30 -0000 1.107
@@ -22,8 +22,6 @@
*/
package org.apache.slide.webdav.util;
-import org.apache.slide.util.*;
-
import java.io.IOException;
import java.io.StringReader;
import java.util.Date;
@@ -31,8 +29,10 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Vector;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
@@ -41,12 +41,13 @@
import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.content.Content;
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;
import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
+import org.apache.slide.event.VetoException;
import org.apache.slide.lock.Lock;
import org.apache.slide.lock.LockTokenNotFoundException;
import org.apache.slide.lock.NodeLock;
@@ -66,12 +67,12 @@
import org.apache.slide.structure.Structure;
import org.apache.slide.structure.SubjectNode;
import org.apache.slide.util.Configuration;
+import org.apache.slide.util.XMLValue;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.method.MethodNotAllowedException;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.CheckedInVersionControlled;
-//import org.apache.slide.webdav.util.resourcekind.CheckedInVersionControlledImpl;
import org.apache.slide.webdav.util.resourcekind.CheckedOut;
import org.apache.slide.webdav.util.resourcekind.CheckedOutVersionControlled;
import org.apache.slide.webdav.util.resourcekind.DeltavCompliantUnmappedUrl;
@@ -84,8 +85,6 @@
import org.apache.slide.webdav.util.resourcekind.Working;
import org.apache.slide.webdav.util.resourcekind.WorkingImpl;
import org.apache.slide.webdav.util.resourcekind.WorkspaceImpl;
-import org.apache.slide.event.VetoException;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
1.33 +19 -14 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java
Index: UriHandler.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- UriHandler.java 7 Jul 2004 15:08:59 -0000 1.32
+++ UriHandler.java 5 Aug 2004 14:43:30 -0000 1.33
@@ -23,29 +23,34 @@
package org.apache.slide.webdav.util;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
import org.apache.slide.common.Domain;
-import org.apache.slide.common.SlideToken;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
-import org.apache.slide.structure.ObjectAlreadyExistsException;
-import org.apache.slide.structure.ObjectNotFoundException;
-import org.apache.slide.structure.LinkedObjectNotFoundException;
-import org.apache.slide.structure.Structure;
-import org.apache.slide.structure.SubjectNode;
+import org.apache.slide.common.SlideToken;
import org.apache.slide.content.Content;
import org.apache.slide.content.NodeProperty;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
-import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeRevisionDescriptor;
+import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.content.RevisionAlreadyExistException;
-import org.apache.slide.content.RevisionNotFoundException;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
+import org.apache.slide.content.RevisionNotFoundException;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
+import org.apache.slide.event.VetoException;
import org.apache.slide.lock.ObjectLockedException;
import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.event.VetoException;
+import org.apache.slide.structure.LinkedObjectNotFoundException;
+import org.apache.slide.structure.ObjectAlreadyExistsException;
+import org.apache.slide.structure.ObjectNotFoundException;
+import org.apache.slide.structure.Structure;
+import org.apache.slide.structure.SubjectNode;
/**
1.24 +6 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavConstants.java
Index: WebdavConstants.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavConstants.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- WebdavConstants.java 28 Jul 2004 09:32:07 -0000 1.23
+++ WebdavConstants.java 5 Aug 2004 14:43:30 -0000 1.24
@@ -23,7 +23,9 @@
package org.apache.slide.webdav.util;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
/**
* WebDAV constants.
1.9 +6 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ComputedPropertyProvider.java
Index: ComputedPropertyProvider.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ComputedPropertyProvider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComputedPropertyProvider.java 28 Jul 2004 09:32:08 -0000 1.8
+++ ComputedPropertyProvider.java 5 Aug 2004 14:43:30 -0000 1.9
@@ -27,15 +27,16 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.PropertyName;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
import org.apache.slide.content.Content;
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.NodeProperty.NamespaceCache;
import org.apache.slide.search.PropertyProvider;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
1.39 +6 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java
Index: PropertyRetrieverImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- PropertyRetrieverImpl.java 2 Aug 2004 16:36:06 -0000 1.38
+++ PropertyRetrieverImpl.java 5 Aug 2004 14:43:30 -0000 1.39
@@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.PropertyName;
import org.apache.slide.common.RequestedProperties;
@@ -38,11 +39,11 @@
import org.apache.slide.common.UriPath;
import org.apache.slide.content.Content;
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;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.lock.Lock;
import org.apache.slide.search.RequestedResource;
import org.apache.slide.security.AccessDeniedException;
@@ -53,7 +54,6 @@
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.jdom.CDATA;
import org.jdom.Comment;
import org.jdom.Element;
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropertySearchSetProperty.java 28 Jul 2004 09:32:07 -0000 1.5
+++ PropertySearchSetProperty.java 5 Aug 2004 14:43:31 -0000 1.6
@@ -21,8 +21,8 @@
package org.apache.slide.webdav.util;
-import java.util.HashMap;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Iterator;
import org.apache.slide.content.NodeProperty.NamespaceCache;
1.8 +6 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java
Index: DirectoryIndexGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DirectoryIndexGenerator.java 28 Jul 2004 09:32:08 -0000 1.7
+++ DirectoryIndexGenerator.java 5 Aug 2004 14:43:31 -0000 1.8
@@ -41,10 +41,10 @@
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.lock.Lock;
import org.apache.slide.lock.NodeLock;
+import org.apache.slide.security.NodePermission;
+import org.apache.slide.security.Security;
import org.apache.slide.structure.ObjectNode;
import org.apache.slide.structure.Structure;
-import org.apache.slide.security.Security;
-import org.apache.slide.security.NodePermission;
import org.apache.slide.util.Messages;
import org.apache.slide.webdav.WebdavServletConfig;
1.23 +7 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AclConstants.java
Index: AclConstants.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AclConstants.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AclConstants.java 28 Jul 2004 09:32:08 -0000 1.22
+++ AclConstants.java 5 Aug 2004 14:43:31 -0000 1.23
@@ -23,11 +23,12 @@
package org.apache.slide.webdav.util;
-import java.util.*;
-
-import org.apache.slide.search.basic.Literals;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import org.apache.slide.content.NodeProperty.NamespaceCache;
+import org.apache.slide.search.basic.Literals;
/**
* ACL constants.
1.6 +4 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/LabeledRevisionNotFoundException.java
Index: LabeledRevisionNotFoundException.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/LabeledRevisionNotFoundException.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LabeledRevisionNotFoundException.java 2 Aug 2004 16:36:06 -0000 1.5
+++ LabeledRevisionNotFoundException.java 5 Aug 2004 14:43:31 -0000 1.6
@@ -24,7 +24,6 @@
// import list
import org.apache.slide.webdav.WebdavException;
-import org.apache.slide.webdav.util.WebdavStatus;
/**
* This Exception is thrown if a revision with the given label was not found.
1.3 +4 -3 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UnlockListenerImpl.java
Index: UnlockListenerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UnlockListenerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnlockListenerImpl.java 11 Feb 2004 11:30:34 -0000 1.2
+++ UnlockListenerImpl.java 5 Aug 2004 14:43:31 -0000 1.3
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
1.14 +5 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetriever.java
Index: PropertyRetriever.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetriever.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PropertyRetriever.java 28 Jul 2004 09:32:07 -0000 1.13
+++ PropertyRetriever.java 5 Aug 2004 14:43:31 -0000 1.14
@@ -24,6 +24,7 @@
// import list
import java.util.List;
+
import org.apache.slide.common.RequestedProperties;
import org.apache.slide.common.SlideException;
import org.apache.slide.content.NodeRevisionDescriptor;
1.23 +6 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java
Index: WebdavUtils.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- WebdavUtils.java 2 Aug 2004 16:36:06 -0000 1.22
+++ WebdavUtils.java 5 Aug 2004 14:43:31 -0000 1.23
@@ -48,7 +48,8 @@
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.method.MethodNotAllowedException;
-
+import org.apache.util.URLUtil;
+import org.apache.util.WebdavStatus;
/**
* A collection of various utility and convenience methods.
1.9 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/DeltavCompliantImpl.java
Index: DeltavCompliantImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/DeltavCompliantImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DeltavCompliantImpl.java 11 Feb 2004 11:30:43 -0000 1.8
+++ DeltavCompliantImpl.java 5 Aug 2004 14:43:32 -0000 1.9
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class DeltavCompliantImpl extends AbstractResourceKind implements DeltavCompliant {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionHistoryImpl.java
Index: VersionHistoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionHistoryImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VersionHistoryImpl.java 11 Feb 2004 11:30:44 -0000 1.5
+++ VersionHistoryImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class VersionHistoryImpl extends AbstractResourceKind implements VersionHistory {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionControlledCollectionImpl.java
Index: VersionControlledCollectionImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionControlledCollectionImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VersionControlledCollectionImpl.java 11 Feb 2004 11:30:43 -0000 1.5
+++ VersionControlledCollectionImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class VersionControlledCollectionImpl extends AbstractResourceKind implements VersionControlledCollection {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/WorkspaceImpl.java
Index: WorkspaceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/WorkspaceImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WorkspaceImpl.java 11 Feb 2004 11:30:44 -0000 1.5
+++ WorkspaceImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class WorkspaceImpl extends AbstractResourceKind implements Workspace {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CheckedInVersionControlledImpl.java
Index: CheckedInVersionControlledImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CheckedInVersionControlledImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CheckedInVersionControlledImpl.java 11 Feb 2004 11:30:42 -0000 1.5
+++ CheckedInVersionControlledImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class CheckedInVersionControlledImpl extends AbstractResourceKind implements CheckedInVersionControlled {
1.7 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/DeltavCompliantCollectionImpl.java
Index: DeltavCompliantCollectionImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/DeltavCompliantCollectionImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeltavCompliantCollectionImpl.java 11 Feb 2004 11:30:43 -0000 1.6
+++ DeltavCompliantCollectionImpl.java 5 Aug 2004 14:43:32 -0000 1.7
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class DeltavCompliantCollectionImpl extends AbstractResourceKind implements DeltavCompliantCollection {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionImpl.java
Index: VersionImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VersionImpl.java 11 Feb 2004 11:30:44 -0000 1.5
+++ VersionImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class VersionImpl extends AbstractResourceKind implements Version {
1.9 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/PrincipalImpl.java
Index: PrincipalImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/PrincipalImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PrincipalImpl.java 11 Feb 2004 11:30:43 -0000 1.8
+++ PrincipalImpl.java 5 Aug 2004 14:43:32 -0000 1.9
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class PrincipalImpl extends DeltavCompliantImpl implements Principal {
1.7 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ResourceKind.java
Index: ResourceKind.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ResourceKind.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceKind.java 11 Feb 2004 11:30:43 -0000 1.6
+++ ResourceKind.java 5 Aug 2004 14:43:32 -0000 1.7
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
/**
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CheckedOutVersionControlledImpl.java
Index: CheckedOutVersionControlledImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CheckedOutVersionControlledImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CheckedOutVersionControlledImpl.java 11 Feb 2004 11:30:43 -0000 1.5
+++ CheckedOutVersionControlledImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class CheckedOutVersionControlledImpl extends AbstractResourceKind implements CheckedOutVersionControlled {
1.5 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/DeltavCompliantUnmappedUrlImpl.java
Index: DeltavCompliantUnmappedUrlImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/DeltavCompliantUnmappedUrlImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeltavCompliantUnmappedUrlImpl.java 11 Feb 2004 11:30:43 -0000 1.4
+++ DeltavCompliantUnmappedUrlImpl.java 5 Aug 2004 14:43:32 -0000 1.5
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class DeltavCompliantUnmappedUrlImpl extends AbstractResourceKind implements DeltavCompliantUnmappedUrl {
1.5 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionControlledConfigurationImpl.java
Index: VersionControlledConfigurationImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionControlledConfigurationImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VersionControlledConfigurationImpl.java 11 Feb 2004 11:30:43 -0000 1.4
+++ VersionControlledConfigurationImpl.java 5 Aug 2004 14:43:32 -0000 1.5
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class VersionControlledConfigurationImpl extends AbstractResourceKind implements VersionControlledConfiguration {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CheckedOutVersionControlledConfigurationImpl.java
Index: CheckedOutVersionControlledConfigurationImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CheckedOutVersionControlledConfigurationImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CheckedOutVersionControlledConfigurationImpl.java 11 Feb 2004 11:30:43 -0000 1.5
+++ CheckedOutVersionControlledConfigurationImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class CheckedOutVersionControlledConfigurationImpl extends AbstractResourceKind implements CheckedOutVersionControlledConfiguration {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CollectionVersionImpl.java
Index: CollectionVersionImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CollectionVersionImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CollectionVersionImpl.java 11 Feb 2004 11:30:43 -0000 1.5
+++ CollectionVersionImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class CollectionVersionImpl extends AbstractResourceKind implements CollectionVersion {
1.5 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionControlledImpl.java
Index: VersionControlledImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionControlledImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VersionControlledImpl.java 11 Feb 2004 11:30:43 -0000 1.4
+++ VersionControlledImpl.java 5 Aug 2004 14:43:32 -0000 1.5
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class VersionControlledImpl extends AbstractResourceKind implements VersionControlled {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/WorkingImpl.java
Index: WorkingImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/WorkingImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WorkingImpl.java 11 Feb 2004 11:30:44 -0000 1.5
+++ WorkingImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class WorkingImpl extends AbstractResourceKind implements Working {
1.5 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CheckedOutImpl.java
Index: CheckedOutImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/CheckedOutImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CheckedOutImpl.java 11 Feb 2004 11:30:43 -0000 1.4
+++ CheckedOutImpl.java 5 Aug 2004 14:43:32 -0000 1.5
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class CheckedOutImpl extends AbstractResourceKind implements CheckedOut {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ActivityImpl.java
Index: ActivityImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ActivityImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ActivityImpl.java 11 Feb 2004 11:30:42 -0000 1.5
+++ ActivityImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class ActivityImpl extends AbstractResourceKind implements Activity {
1.6 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/BaselineImpl.java
Index: BaselineImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/BaselineImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaselineImpl.java 11 Feb 2004 11:30:42 -0000 1.5
+++ BaselineImpl.java 5 Aug 2004 14:43:32 -0000 1.6
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class BaselineImpl extends AbstractResourceKind implements Baseline {
1.5 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionableImpl.java
Index: VersionableImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/VersionableImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VersionableImpl.java 11 Feb 2004 11:30:44 -0000 1.4
+++ VersionableImpl.java 5 Aug 2004 14:43:33 -0000 1.5
@@ -23,7 +23,7 @@
package org.apache.slide.webdav.util.resourcekind;
-import java.util.*;
+import java.util.Set;
public class VersionableImpl extends AbstractResourceKind implements Versionable {
1.30 +4 -3 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java
Index: AbstractResourceKind.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AbstractResourceKind.java 16 Jun 2004 14:46:25 -0000 1.29
+++ AbstractResourceKind.java 5 Aug 2004 14:43:33 -0000 1.30
@@ -33,6 +33,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.NamespaceConfig;
import org.apache.slide.content.NodeRevisionDescriptor;
1.12 +4 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavException.java
Index: WebdavException.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavException.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebdavException.java 2 Aug 2004 16:36:07 -0000 1.11
+++ WebdavException.java 5 Aug 2004 14:43:34 -0000 1.12
@@ -23,9 +23,8 @@
package org.apache.slide.webdav;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.apache.slide.common.SlideException;
-
+import org.apache.slide.webdav.util.WebdavStatus;
/**
* Exception class used by the WebDAV server classes. A WebDAV exception is
1.13 +5 -3 jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServletConfig.java
Index: WebdavServletConfig.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServletConfig.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WebdavServletConfig.java 28 Jul 2004 09:32:57 -0000 1.12
+++ WebdavServletConfig.java 5 Aug 2004 14:43:34 -0000 1.13
@@ -27,8 +27,10 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
+
import org.apache.slide.util.XMLValue;
import org.jdom.Element;
import org.jdom.JDOMException;
1.63 +5 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- WebdavServlet.java 2 Aug 2004 16:36:07 -0000 1.62
+++ WebdavServlet.java 5 Aug 2004 14:43:34 -0000 1.63
@@ -52,8 +52,8 @@
import org.apache.slide.util.logger.Logger;
import org.apache.slide.webdav.util.DirectoryIndexGenerator;
import org.apache.slide.webdav.util.WebdavConstants;
-import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
/**
* The WebDAV servlet. It is responsible for dispatching incoming requests to
1.6 +3 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalSearchPropertySetReport.java
Index: PrincipalSearchPropertySetReport.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalSearchPropertySetReport.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PrincipalSearchPropertySetReport.java 2 Aug 2004 16:36:05 -0000 1.5
+++ PrincipalSearchPropertySetReport.java 5 Aug 2004 14:43:34 -0000 1.6
@@ -40,7 +40,6 @@
import org.apache.slide.webdav.util.WebdavStatus;
import org.apache.slide.webdav.util.resourcekind.PrincipalImpl;
import org.jdom.Element;
-import org.jdom.Namespace;
/**
1.6 +4 -3 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/AclPrincipalPropSetReport.java
Index: AclPrincipalPropSetReport.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/AclPrincipalPropSetReport.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AclPrincipalPropSetReport.java 2 Aug 2004 16:36:05 -0000 1.5
+++ AclPrincipalPropSetReport.java 5 Aug 2004 14:43:34 -0000 1.6
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.util.Enumeration;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.PropertyParseException;
import org.apache.slide.common.RequestedProperties;
1.8 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/VersionTreeReport.java
Index: VersionTreeReport.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/VersionTreeReport.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VersionTreeReport.java 2 Aug 2004 16:36:05 -0000 1.7
+++ VersionTreeReport.java 5 Aug 2004 14:43:34 -0000 1.8
@@ -47,11 +47,11 @@
import org.apache.slide.webdav.util.UriHandler;
import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
+import org.apache.slide.webdav.util.WebdavStatus;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
import org.apache.slide.webdav.util.resourcekind.Version;
import org.apache.slide.webdav.util.resourcekind.VersionControlled;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.jdom.Element;
import org.jdom.JDOMException;
1.10 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalPropertySearchReport.java
Index: PrincipalPropertySearchReport.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalPropertySearchReport.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PrincipalPropertySearchReport.java 2 Aug 2004 16:36:05 -0000 1.9
+++ PrincipalPropertySearchReport.java 5 Aug 2004 14:43:34 -0000 1.10
@@ -45,8 +45,8 @@
import org.apache.slide.webdav.util.AclConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
import org.jdom.Element;
import org.jdom.Namespace;
import org.jdom.output.XMLOutputter;
1.8 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/LocateByHistoryReport.java
Index: LocateByHistoryReport.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/LocateByHistoryReport.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LocateByHistoryReport.java 2 Aug 2004 16:36:05 -0000 1.7
+++ LocateByHistoryReport.java 5 Aug 2004 14:43:34 -0000 1.8
@@ -44,11 +44,11 @@
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.UriHandler;
import org.apache.slide.webdav.util.ViolatedPrecondition;
+import org.apache.slide.webdav.util.WebdavStatus;
import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
import org.apache.slide.webdav.util.resourcekind.VersionControlled;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.jdom.Element;
import org.jdom.JDOMException;
1.9 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/AbstractReport.java
Index: AbstractReport.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/AbstractReport.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractReport.java 2 Aug 2004 16:36:05 -0000 1.8
+++ AbstractReport.java 5 Aug 2004 14:43:34 -0000 1.9
@@ -44,8 +44,8 @@
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.PropertyRetriever;
import org.apache.slide.webdav.util.PropertyRetrieverImpl;
-import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
import org.jdom.Element;
import org.jdom.Namespace;
1.10 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalMatchReport.java
Index: PrincipalMatchReport.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalMatchReport.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PrincipalMatchReport.java 2 Aug 2004 16:36:05 -0000 1.9
+++ PrincipalMatchReport.java 5 Aug 2004 14:43:34 -0000 1.10
@@ -44,8 +44,8 @@
import org.apache.slide.webdav.util.AclConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
import org.jdom.Element;
import org.jdom.Namespace;
import org.jdom.output.XMLOutputter;
1.6 +2 -1 jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XByteBuffer.java
Index: XByteBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XByteBuffer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XByteBuffer.java 28 Jul 2004 09:32:36 -0000 1.5
+++ XByteBuffer.java 5 Aug 2004 14:43:34 -0000 1.6
@@ -20,7 +20,8 @@
package org.apache.slide.webdav.logger;
-import java.io.*;
+import java.io.IOException;
+
import org.apache.slide.common.Domain;
/**
1.7 +5 -3 jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XServletInputStreamFacade.java
Index: XServletInputStreamFacade.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XServletInputStreamFacade.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XServletInputStreamFacade.java 28 Jul 2004 09:32:32 -0000 1.6
+++ XServletInputStreamFacade.java 5 Aug 2004 14:43:34 -0000 1.7
@@ -25,7 +25,9 @@
package org.apache.slide.webdav.logger;
import java.io.IOException;
+
import javax.servlet.ServletInputStream;
+
import org.apache.slide.common.Domain;
/**
1.13 +5 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/LogFilter.java
Index: LogFilter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/LogFilter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LogFilter.java 2 Aug 2004 16:36:07 -0000 1.12
+++ LogFilter.java 5 Aug 2004 14:43:34 -0000 1.13
@@ -31,6 +31,7 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
1.4 +6 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/XmlLogFilter.java
Index: XmlLogFilter.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/XmlLogFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XmlLogFilter.java 28 Jul 2004 09:32:51 -0000 1.3
+++ XmlLogFilter.java 5 Aug 2004 14:43:34 -0000 1.4
@@ -27,6 +27,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -35,6 +36,7 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.slide.webdav.logger.XHttpServletRequestFacade;
import org.apache.slide.webdav.logger.XHttpServletResponseFacade;
import org.apache.slide.webdav.logger.XMLTestCaseGenerator;
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter
LogFilter.java XmlLogFilter.java
Posted by Oliver Zeigermann <ol...@zeigermann.de>.
NotificationTrigger seems to be broken after this commit.
Oliver
dflorey@apache.org wrote:
> dflorey 2004/08/05 07:43:35
>
> Modified: src/webdav/server/org/apache/slide/webdav/method
> VersionControlMethod.java CheckinMethod.java
> EventMethod.java PollMethod.java DeleteMethod.java
> SubscribeMethod.java UncheckoutMethod.java
> MkworkspaceMethod.java DefaultMethodFactory.java
> CheckoutMethod.java SearchMethod.java
> MkcolMethod.java GetMethod.java
> src/webdav/server/org/apache/slide/webdav/event
> WebdavEvent.java Subscriber.java
> NotificationTrigger.java
> src/webdav/server/org/apache/slide/webdav/util
> ViolatedPrecondition.java VersioningHelper.java
> UriHandler.java WebdavConstants.java
> ComputedPropertyProvider.java
> PropertyRetrieverImpl.java
> PropertySearchSetProperty.java
> DirectoryIndexGenerator.java AclConstants.java
> LabeledRevisionNotFoundException.java
> UnlockListenerImpl.java PropertyRetriever.java
> WebdavUtils.java
> src/webdav/server/org/apache/slide/webdav/util/resourcekind
> DeltavCompliantImpl.java VersionHistoryImpl.java
> VersionControlledCollectionImpl.java
> WorkspaceImpl.java
> CheckedInVersionControlledImpl.java
> DeltavCompliantCollectionImpl.java VersionImpl.java
> PrincipalImpl.java ResourceKind.java
> CheckedOutVersionControlledImpl.java
> DeltavCompliantUnmappedUrlImpl.java
> VersionControlledConfigurationImpl.java
> CheckedOutVersionControlledConfigurationImpl.java
> CollectionVersionImpl.java
> VersionControlledImpl.java WorkingImpl.java
> CheckedOutImpl.java ActivityImpl.java
> BaselineImpl.java VersionableImpl.java
> AbstractResourceKind.java
> src/webdav/server/org/apache/slide/webdav
> WebdavException.java WebdavServletConfig.java
> WebdavServlet.java
> src/webdav/server/org/apache/slide/webdav/method/report
> PrincipalSearchPropertySetReport.java
> AclPrincipalPropSetReport.java
> VersionTreeReport.java
> PrincipalPropertySearchReport.java
> LocateByHistoryReport.java AbstractReport.java
> PrincipalMatchReport.java
> src/webdav/server/org/apache/slide/webdav/logger
> XByteBuffer.java XServletInputStreamFacade.java
> src/webdav/server/org/apache/slide/webdav/filter
> LogFilter.java XmlLogFilter.java
> Log:
> Added persistence for subscrptions
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org