luetzkendorf 2005/02/25 09:07:59
Modified: src/webdav/server/org/apache/slide/webdav/util
UnlockListenerImpl.java
Log:
Introduction of some more detailed Events triggered by the WebDAV layer.
E.g. now you will be informed if a single resource is copied, moved or deleted
while MOVE, COPY or DELETE.
Moved creation of VersioningHelper up to the AbstractWebdavMethod.
Added some getter to AbstractWebdavMethod to provide some information
to the WebdavEventListener.
Revision Changes Path
1.6 +9 -17
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnlockListenerImpl.java 21 Dec 2004 16:17:04 -0000 1.5
+++ UnlockListenerImpl.java 25 Feb 2005 17:07:59 -0000 1.6
@@ -26,9 +26,6 @@
import java.util.Enumeration;
import java.util.HashSet;
-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;
@@ -41,7 +38,6 @@
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
import org.apache.slide.util.Configuration;
-import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.CheckedOutVersionControlled;
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
@@ -50,25 +46,22 @@
* Implements UnlockListener
*/
public class UnlockListenerImpl implements UnlockListener {
- SlideToken slideToken;
- NamespaceAccessToken token;
- WebdavServletConfig config;
- HttpServletRequest req;
- HttpServletResponse resp;
+ private SlideToken slideToken;
+ private NamespaceAccessToken token;
+ private VersioningHelper versioningHelper;
// counts the locks this listner is called for
- int unlockCount = 0;
+ private int unlockCount = 0;
// set ot uris that are Lock-Null resources anre removed by this listener
- HashSet removedLockNullResources = new HashSet();
+ private HashSet removedLockNullResources = new HashSet();
/**
* Constructor
*/
- public UnlockListenerImpl( SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, HttpServletRequest req, HttpServletResponse
resp ) {
+ public UnlockListenerImpl( SlideToken slideToken, NamespaceAccessToken
token,
+ VersioningHelper versioningHelper) {
this.slideToken = slideToken;
this.token = token;
- this.config = config;
- this.req = req;
- this.resp = resp;
+ this.versioningHelper = versioningHelper;
}
/**
@@ -110,9 +103,8 @@
if ( (checkinLocktokenProperty != null) &&
(checkinLocktokenProperty.getValue() != null)
// &&
slideToken.checkLockToken(checkinLocktokenProperty.getValue().toString())
) {
- VersioningHelper versionHelper =
VersioningHelper.getVersioningHelper(slideToken, token, req, resp, config);
try {
- versionHelper.checkin(revisionDescriptors,
revisionDescriptor, false, false, true);
+ versioningHelper.checkin(revisionDescriptors,
revisionDescriptor, false, false, true);
}
catch (java.io.IOException e) {}
catch (org.jdom.JDOMException e) {}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]