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 re...@locus.apache.org on 2000/11/25 02:36:18 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method CopyMethod.java DeleteMethod.java GetMethod.java LockMethod.java MkcolMethod.java MoveMethod.java OptionsMethod.java PropFindMethod.java PropPatchMethod.java PutMethod.java UnlockMethod.java WebdavMethod.java
remm 00/11/24 17:36:16
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java DeleteMethod.java GetMethod.java
LockMethod.java MkcolMethod.java MoveMethod.java
OptionsMethod.java PropFindMethod.java
PropPatchMethod.java PutMethod.java
UnlockMethod.java WebdavMethod.java
Log:
- Update teh WebDAV servlet to use the new SlideToken.
Revision Changes Path
1.2 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java
Index: CopyMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopyMethod.java 2000/11/22 06:20:46 1.1
+++ CopyMethod.java 2000/11/25 01:36:09 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.2 2000/11/25 01:36:09 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:09 $
*
* ====================================================================
*
@@ -210,7 +210,7 @@
}
try {
- macro.copy(credToken, sourceUri, destinationUri, macroParameters);
+ macro.copy(slideToken, sourceUri, destinationUri, macroParameters);
if (overwrite) {
resp.setStatus(WebdavStatus.SC_NO_CONTENT);
} else {
1.2 +4 -4 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteMethod.java 2000/11/22 06:20:46 1.1
+++ DeleteMethod.java 2000/11/25 01:36:09 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v 1.2 2000/11/25 01:36:09 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:09 $
*
* ====================================================================
*
@@ -136,7 +136,7 @@
throws WebdavException {
try {
- macro.delete(credToken, toDelete);
+ macro.delete(slideToken, toDelete);
resp.setStatus(WebdavStatus.SC_NO_CONTENT);
} catch (DeleteMacroException e) {
String errorMessage = generateErrorMessage(e);
1.2 +14 -14 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetMethod.java 2000/11/22 06:20:46 1.1
+++ GetMethod.java 2000/11/25 01:36:09 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v 1.2 2000/11/25 01:36:09 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:09 $
*
* ====================================================================
*
@@ -180,15 +180,15 @@
// Then we must get object contents ...
- ObjectNode object = structure.retrieve(credToken, resourcePath);
+ ObjectNode object = structure.retrieve(slideToken, resourcePath);
NodeRevisionDescriptors revisionDescriptors =
- content.retrieve(credToken, resourcePath);
+ content.retrieve(slideToken, resourcePath);
if (revisionDescriptors.hasRevisions()) {
// Retrieve latest revision descriptor
NodeRevisionDescriptor revisionDescriptor =
- content.retrieve(credToken, revisionDescriptors);
+ content.retrieve(slideToken, revisionDescriptors);
if (isCollection(revisionDescriptor)) {
@@ -208,12 +208,12 @@
ServletOutputStream os = resp.getOutputStream();
NodeRevisionContent revisionContent =
- content.retrieve(credToken, revisionDescriptors,
+ content.retrieve(slideToken, revisionDescriptors,
revisionDescriptor);
InputStream is = null;
if (printContent) {
is = content.retrieve
- (credToken, revisionDescriptors,
+ (slideToken, revisionDescriptors,
revisionDescriptor).streamContent();
}
@@ -408,8 +408,8 @@
try {
permissionsList =
- security.enumeratePermissions(credToken, object.getUri());
- locksList = lock.enumerateLocks(credToken, object.getUri());
+ security.enumeratePermissions(slideToken, object.getUri());
+ locksList = lock.enumerateLocks(slideToken, object.getUri());
} catch (SlideException e) {
@@ -461,10 +461,10 @@
try {
NodeRevisionDescriptors revisionDescriptors =
- content.retrieve(credToken, currentResource);
+ content.retrieve(slideToken, currentResource);
// Retrieve latest revision descriptor
currentDescriptor =
- content.retrieve(credToken, revisionDescriptors);
+ content.retrieve(slideToken, revisionDescriptors);
} catch (SlideException e) {
@@ -480,8 +480,8 @@
try {
permissionsList =
- security.enumeratePermissions(credToken, currentResource);
- locksList = lock.enumerateLocks(credToken, currentResource);
+ security.enumeratePermissions(slideToken, currentResource);
+ locksList = lock.enumerateLocks(slideToken, currentResource);
} catch (SlideException e) {
1.2 +19 -17 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LockMethod.java 2000/11/22 06:20:46 1.1
+++ LockMethod.java 2000/11/25 01:36:10 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v 1.2 2000/11/25 01:36:10 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:10 $
*
* ====================================================================
*
@@ -436,14 +436,14 @@
try {
toLockSubject = (SubjectNode) structure
- .retrieve(credToken, lockInfo_lockSubject);
+ .retrieve(slideToken, lockInfo_lockSubject);
} catch (ObjectNotFoundException ex) {
// Creating a lock null resource
toLockSubject = new SubjectNode();
// Creating new subject
- structure.create(credToken, toLockSubject,
+ structure.create(slideToken, toLockSubject,
lockInfo_lockSubject);
NodeRevisionDescriptor revisionDescriptor =
@@ -457,15 +457,16 @@
revisionDescriptor.setProperty(property);
// Creating the revision descriptor
- content.create(credToken, lockInfo_lockSubject,
+ content.create(slideToken, lockInfo_lockSubject,
revisionDescriptor, null);
}
SubjectNode credentialsSubject =
(SubjectNode) structure.retrieve
- (credToken, namespaceConfig.getUsersPath() + "/"
- + credToken.getPublicCredentials());
+ (slideToken, namespaceConfig.getUsersPath() + "/"
+ + slideToken.getCredentialsToken()
+ .getPublicCredentials());
NodeLock lockToken = null;
@@ -480,14 +481,14 @@
new NodeLock(toLockSubject, credentialsSubject,
namespaceConfig.getCreateObjectAction(),
lockDate, inheritance, exclusive);
- lock.lock(credToken, lockToken);
+ lock.lock(slideToken, lockToken);
try {
lockToken = new NodeLock
(lockToken,
namespaceConfig.getCreateRevisionMetadataAction()
.getUri());
- lock.lock(credToken, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -497,7 +498,7 @@
(lockToken,
namespaceConfig.getModifyRevisionMetadataAction()
.getUri());
- lock.lock(credToken, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -507,7 +508,7 @@
(lockToken,
namespaceConfig.getRemoveRevisionMetadataAction()
.getUri());
- lock.lock(credToken, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -517,7 +518,7 @@
(lockToken,
namespaceConfig.getModifyRevisionContentAction()
.getUri());
- lock.lock(credToken, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -527,7 +528,7 @@
(lockToken,
namespaceConfig.getRemoveRevisionContentAction()
.getUri());
- lock.lock(credToken, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -537,7 +538,7 @@
new NodeLock(lockToken,
namespaceConfig.getRemoveObjectAction()
.getUri());
- lock.lock(credToken, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -563,14 +564,15 @@
try {
Enumeration lockTokens =
- lock.enumerateLocks(credToken, lockInfo_lockSubject);
+ lock.enumerateLocks(slideToken, lockInfo_lockSubject);
NodeLock currentLockToken = null;
Date newExpirationDate =
new Date((new Date()).getTime() + (lockDuration * 1000));
while (lockTokens.hasMoreElements()) {
currentLockToken = (NodeLock) lockTokens.nextElement();
- lock.renew(credToken, currentLockToken, newExpirationDate);
+ lock.renew(slideToken, currentLockToken,
+ newExpirationDate);
}
showLockDiscoveryInfo(currentLockToken);
1.2 +5 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MkcolMethod.java 2000/11/22 06:20:46 1.1
+++ MkcolMethod.java 2000/11/25 01:36:10 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v 1.2 2000/11/25 01:36:10 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:10 $
*
* ====================================================================
*
@@ -218,8 +218,8 @@
}
try {
- structure.create(credToken, collection, colName);
- content.create(credToken, colName, revisionDescriptor, null);
+ structure.create(slideToken, collection, colName);
+ content.create(slideToken, colName, revisionDescriptor, null);
} catch (ObjectNotFoundException e) {
resp.setStatus(WebdavStatus.SC_CONFLICT);
throw new WebdavException(WebdavStatus.SC_CONFLICT);
1.2 +4 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MoveMethod.java 2000/11/22 06:20:46 1.1
+++ MoveMethod.java 2000/11/25 01:36:10 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.2 2000/11/25 01:36:10 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:10 $
*
* ====================================================================
*
@@ -205,7 +205,7 @@
}
try {
- macro.move(credToken, sourceUri, destinationUri, macroParameters);
+ macro.move(slideToken, sourceUri, destinationUri, macroParameters);
if (overwrite) {
resp.setStatus(WebdavStatus.SC_NO_CONTENT);
} else {
1.2 +5 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OptionsMethod.java 2000/11/22 06:20:46 1.1
+++ OptionsMethod.java 2000/11/25 01:36:11 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v 1.2 2000/11/25 01:36:11 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:11 $
*
* ====================================================================
*
@@ -110,9 +110,9 @@
try {
NodeRevisionDescriptors revisionDescriptors =
- content.retrieve(credToken, resourceUri);
+ content.retrieve(slideToken, resourceUri);
NodeRevisionDescriptor revisionDescriptor =
- content.retrieve(credToken, revisionDescriptors);
+ content.retrieve(slideToken, revisionDescriptors);
boolean isCollection = isCollection(revisionDescriptor);
methodsAllowed = "OPTIONS, GET, HEAD, POST, DELETE, TRACE, "
+ "PROPFIND, PROPPATCH, COPY, MOVE, LOCK, UNLOCK";
1.2 +9 -8 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropFindMethod.java 2000/11/22 06:20:46 1.1
+++ PropFindMethod.java 2000/11/25 01:36:11 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.2 2000/11/25 01:36:11 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:11 $
*
* ====================================================================
*
@@ -309,7 +309,7 @@
ObjectNode resource = null;
try {
- resource = structure.retrieve(credToken, resourceUri);
+ resource = structure.retrieve(slideToken, resourceUri);
} catch (StructureException e) {
// We silently catch that since we need to generate some XML ...
e.printStackTrace();
@@ -358,7 +358,7 @@
Enumeration enum = null;
try {
- enum = structure.getChildren(credToken, cur);
+ enum = structure.getChildren(slideToken, cur);
} catch (StructureException e) {
resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
throw new WebdavException
@@ -426,11 +426,12 @@
try {
generatedXML.writeElement(null, "href", WebdavXMLPrinter.OPENING);
- revisionDescriptors = content.retrieve(credToken, object.getUri());
+ revisionDescriptors =
+ content.retrieve(slideToken, object.getUri());
try {
- revisionDescriptor = content.retrieve(credToken,
+ revisionDescriptor = content.retrieve(slideToken,
revisionDescriptors);
isCollection = isCollection(revisionDescriptor);
@@ -479,7 +480,7 @@
generatedXML.writeElement(null, "href", WebdavXMLPrinter.CLOSING);
- Enumeration lockTokens = lock.enumerateLocks(credToken,
+ Enumeration lockTokens = lock.enumerateLocks(slideToken,
object.getUri());
if (lockTokens.hasMoreElements()) {
1.2 +6 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropPatchMethod.java 2000/11/22 06:20:46 1.1
+++ PropPatchMethod.java 2000/11/25 01:36:12 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v 1.2 2000/11/25 01:36:12 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:12 $
*
* ====================================================================
*
@@ -247,12 +247,12 @@
try {
NodeRevisionDescriptors revisionDescriptors =
- content.retrieve(credToken, resourcePath);
+ content.retrieve(slideToken, resourcePath);
NodeRevisionDescriptor revisionDescriptor = null;
try {
revisionDescriptor =
- content.retrieve(credToken, revisionDescriptors);
+ content.retrieve(slideToken, revisionDescriptors);
} catch (RevisionDescriptorNotFoundException ex) {
revisionDescriptor = new NodeRevisionDescriptor(0);
// TODO : Create the initial revision ?
@@ -296,7 +296,7 @@
}
// TEMP !!!! We should do a store instead !!
- content.create(credToken, resourcePath, revisionDescriptor, null);
+ content.create(slideToken, resourcePath, revisionDescriptor, null);
} catch(RevisionAlreadyExistException e) {
// 500 - Internal server error
1.2 +7 -7 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PutMethod.java 2000/11/22 06:20:46 1.1
+++ PutMethod.java 2000/11/25 01:36:12 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.1 2000/11/22 06:20:46 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.2 2000/11/25 01:36:12 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:12 $
*
* ====================================================================
*
@@ -149,7 +149,7 @@
try {
NodeRevisionDescriptors revisionDescriptors =
- content.retrieve(credToken, resourcePath);
+ content.retrieve(slideToken, resourcePath);
NodeRevisionNumber revisionNumber =
revisionDescriptors.getLatestRevision();
NodeRevisionDescriptor revisionDescriptor =
@@ -185,7 +185,7 @@
property = new NodeProperty("resourcetype", "", true);
revisionDescriptor.setProperty(property);
- content.create(credToken, resourcePath, revisionDescriptor,
+ content.create(slideToken, resourcePath, revisionDescriptor,
revisionContent);
} catch (LinkedObjectNotFoundException e) {
@@ -196,7 +196,7 @@
// Todo : Check to see if parent exists
SubjectNode subject = new SubjectNode();
// Creating an object
- structure.create(credToken, subject, resourcePath);
+ structure.create(slideToken, subject, resourcePath);
NodeRevisionDescriptor revisionDescriptor =
new NodeRevisionDescriptor(req.getContentLength());
@@ -334,7 +334,7 @@
new NodeRevisionContent();
revisionContent.setContent(req.getInputStream());
- content.create(credToken, resourcePath, revisionDescriptor,
+ content.create(slideToken, resourcePath, revisionDescriptor,
revisionContent);
}
1.2 +10 -10 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java
Index: UnlockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnlockMethod.java 2000/11/22 06:20:47 1.1
+++ UnlockMethod.java 2000/11/25 01:36:12 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v 1.1 2000/11/22 06:20:47 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:47 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v 1.2 2000/11/25 01:36:12 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:12 $
*
* ====================================================================
*
@@ -155,15 +155,15 @@
try {
- lock.unlock(credToken, requestUri, lockId);
+ lock.unlock(slideToken, requestUri, lockId);
// Checking if the resource at the URI isn't a lock-null
// resource, in which case we must attempt to delete it
- ObjectNode node = structure.retrieve(credToken, requestUri);
+ ObjectNode node = structure.retrieve(slideToken, requestUri);
NodeRevisionDescriptors revisionDescriptors =
- content.retrieve(credToken, requestUri);
+ content.retrieve(slideToken, requestUri);
NodeRevisionDescriptor revisionDescriptor =
- content.retrieve(credToken, revisionDescriptors);
+ content.retrieve(slideToken, revisionDescriptors);
NodeProperty typeProperty =
revisionDescriptor.getProperty
(NodeRevisionDescriptor.TYPE);
@@ -171,9 +171,9 @@
if (typeProperty.getValue().toString()
.equals("<lock-null/>")) {
- content.remove(credToken, requestUri, revisionDescriptor);
- content.remove(credToken, revisionDescriptors);
- structure.remove(credToken, node);
+ content.remove(slideToken, requestUri, revisionDescriptor);
+ content.remove(slideToken, revisionDescriptors);
+ structure.remove(slideToken, node);
}
1.2 +77 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java
Index: WebdavMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebdavMethod.java 2000/11/22 06:20:47 1.1
+++ WebdavMethod.java 2000/11/25 01:36:12 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v 1.1 2000/11/22 06:20:47 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:20:47 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v 1.2 2000/11/25 01:36:12 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/25 01:36:12 $
*
* ====================================================================
*
@@ -192,6 +192,12 @@
/**
+ * Slide token.
+ */
+ protected SlideToken slideToken;
+
+
+ /**
* DOM XML parser.
*/
protected static DocumentBuilder documentBuilder;
@@ -263,7 +269,8 @@
this.credToken = new CredentialsToken("");
}
- this.credToken.setEnforceLockTokens(true);
+ this.slideToken = new SlideToken(this.credToken);
+ this.slideToken.setEnforceLockTokens(true);
this.requestUri = getRelativePath(req);
@@ -336,7 +343,7 @@
if ((result == null) || (result.equals(""))) {
result = "/";
}
- return result;
+ return URLDecode(result);
}
@@ -444,7 +451,7 @@
}
//System.out.println("Lock Token found :-" + lockToken + "-");
- credToken.addLockToken(lockToken);
+ slideToken.addLockToken(lockToken);
pos = ifHeader.indexOf(LOCK_TOKEN, endPos);
@@ -519,4 +526,68 @@
}
+ /**
+ * Decode and return the specified URL-encoded String.
+ *
+ * @param str The url-encoded string
+ *
+ * @exception IllegalArgumentException if a '%' character is not followed
+ * by a valid 2-digit hexadecimal number
+ */
+ protected String URLDecode(String str)
+ throws IllegalArgumentException {
+
+ if (str == null)
+ return (null);
+
+ StringBuffer dec = new StringBuffer();
+ int pos = 0;
+ int len = str.length();
+ dec.ensureCapacity(str.length());
+
+ while (pos < len) {
+ int lookahead; // Look-ahead position
+
+ // Look ahead to the next URLencoded metacharacter, if any
+ for (lookahead = pos; lookahead < len; lookahead++) {
+ char ch = str.charAt(lookahead);
+ if ((ch == '+') || (ch == '%'))
+ break;
+ }
+
+ // If there were non-metacharacters, copy them as a block
+ if (lookahead > pos) {
+ dec.append(str.substring(pos, lookahead));
+ pos = lookahead;
+ }
+
+ // Shortcut out if we are at the end of the string
+ if (pos >= len)
+ break;
+
+ // Process the next metacharacter
+ char meta = str.charAt(pos);
+ if (meta == '+') {
+ dec.append(' ');
+ pos++;
+ } else if (meta == '%') {
+ try {
+ dec.append((char) Integer.parseInt
+ (str.substring(pos+1, pos+3), 16));
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException
+ ("Invalid hexadecimal '" + str.substring(pos+1, pos+3)
+ + " in URLencoded string");
+ } catch (StringIndexOutOfBoundsException e) {
+ throw new IllegalArgumentException
+ ("Invalid unescaped '%' in URLcoded string");
+ }
+ pos += 3;
+ }
+ }
+ return (dec.toString());
+
+ }
+
+
}