pnever 02/04/30 05:39:19
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java LabelMethod.java MoveMethod.java
PropFindMethod.java PropPatchMethod.java
PutMethod.java ReportMethod.java UnlockMethod.java
Log:
Adapted to new determineResourceKind() signature
Revision Changes Path
1.30 +5 -5
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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- CopyMethod.java 29 Apr 2002 16:50:53 -0000 1.29
+++ CopyMethod.java 30 Apr 2002 12:39:19 -0000 1.30
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.29 2002/04/29 16:50:53 pnever Exp $
- * $Revision: 1.29 $
- * $Date: 2002/04/29 16:50:53 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.30 2002/04/30 12:39:19 pnever Exp $
+ * $Revision: 1.30 $
+ * $Date: 2002/04/30 12:39:19 $
*
* ====================================================================
*
@@ -272,7 +272,7 @@
NodeRevisionDescriptors destinationRevisionDescriptors =
versioningHelper.retrieveRevisionDescriptors(destinationUri);
NodeRevisionDescriptor destinationRevisionDescriptor =
versioningHelper.retrieveLatestRevisionDescriptor(destinationUri,
destinationRevisionDescriptors);
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(destinationUri,
destinationRevisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, destinationUri,
destinationRevisionDescriptor);
String checkedOutPropertyValue =
(String)checkedOutDestinationsMap.get(destinationUri);
if (checkedOutPropertyValue != null) {
@@ -363,7 +363,7 @@
if (destinationExists) {
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(targetUri, revisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, targetUri, revisionDescriptor);
if (resourceKind instanceof CheckedInVersionControlled) {
// check precondition
DAV:cannot-modify-version-controlled-content
1.2 +8 -8
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java
Index: LabelMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LabelMethod.java 30 Apr 2002 08:46:00 -0000 1.1
+++ LabelMethod.java 30 Apr 2002 12:39:19 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v
1.1 2002/04/30 08:46:00 juergen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/30 08:46:00 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v
1.2 2002/04/30 12:39:19 pnever Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/30 12:39:19 $
*
* ====================================================================
*
@@ -115,7 +115,7 @@
/**
* LABEL method.
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -409,7 +409,7 @@
versioningHelper.retrieveRevisionDescriptors(labeledResourceUri);
NodeRevisionDescriptor revisionDescriptor =
versioningHelper.retrieveLatestRevisionDescriptor(labeledResourceUri,
revisionDescriptors);
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, revisionDescriptors,
revisionDescriptor);
if (resourceKind instanceof Version) {
if (DeltavConstants.E_REMOVE.equals(operation)) {
@@ -470,7 +470,7 @@
NodeRevisionDescriptor revisionDescriptor =
versioningHelper.retrieveLatestRevisionDescriptor(resourcePath,
revisionDescriptors);
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, revisionDescriptors,
revisionDescriptor);
// check <DAV:must-be-checked-in>
if ( (resourceKind instanceof VersionControlled) &&
@@ -497,7 +497,7 @@
versioningHelper.retrieveRevisionDescriptors(slideResourceUri);
revisionDescriptor =
versioningHelper.retrieveLatestRevisionDescriptor(slideResourceUri,
revisionDescriptors);
- resourceKind =
AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ resourceKind = AbstractResourceKind.determineResourceKind(token,
revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof Version) {
// check <DAV:label-must-exist>
@@ -597,7 +597,7 @@
versioningHelper.retrieveRevisionDescriptors(labeledResourceUri);
NodeRevisionDescriptor revisionDescriptor =
versioningHelper.retrieveLatestRevisionDescriptor(labeledResourceUri,
revisionDescriptors);
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(revisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, revisionDescriptors,
revisionDescriptor);
if (resourceKind instanceof VersionControlled) {
labeledResourceUri =
versioningHelper.getUriOfAssociatedVR(resourcePath);
}
1.33 +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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- MoveMethod.java 29 Apr 2002 16:50:53 -0000 1.32
+++ MoveMethod.java 30 Apr 2002 12:39:19 -0000 1.33
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.32 2002/04/29 16:50:53 pnever Exp $
- * $Revision: 1.32 $
- * $Date: 2002/04/29 16:50:53 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.33 2002/04/30 12:39:19 pnever Exp $
+ * $Revision: 1.33 $
+ * $Date: 2002/04/30 12:39:19 $
*
* ====================================================================
*
@@ -280,7 +280,7 @@
catch( ObjectNotFoundException e ) {}; // can be ignored here!
ResourceKind destinationResourceKind =
- AbstractResourceKind.determineResourceKind( destinationUri,
destinationRevisionDescriptor );
+ AbstractResourceKind.determineResourceKind( token,
destinationUri, destinationRevisionDescriptor );
if( !(destinationResourceKind instanceof
DeltavCompliantUnmappedUrl) ) {
return new ViolatedPrecondition(C_RESOURCE_MUST_BE_NULL,
1.64 +4 -4
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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- PropFindMethod.java 29 Apr 2002 16:50:53 -0000 1.63
+++ PropFindMethod.java 30 Apr 2002 12:39:19 -0000 1.64
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.63 2002/04/29 16:50:53 pnever Exp $
- * $Revision: 1.63 $
- * $Date: 2002/04/29 16:50:53 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.64 2002/04/30 12:39:19 pnever Exp $
+ * $Revision: 1.64 $
+ * $Date: 2002/04/30 12:39:19 $
*
* ====================================================================
*
@@ -508,7 +508,7 @@
Element propElement = new Element(E_PROPSTAT,
Namespace.getNamespace(DEFAULT_NAMESPACE));
propstatElement.addContent(propElement);
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(object.getUri(), revisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, object.getUri(), revisionDescriptor);
String[] filter = null;
if ( ! Configuration.useIntegratedSecurity() ) {
filter = new String[] {F_ACCESS_CONTROL};
1.37 +4 -4
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- PropPatchMethod.java 29 Apr 2002 16:50:53 -0000 1.36
+++ PropPatchMethod.java 30 Apr 2002 12:39:19 -0000 1.37
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.36 2002/04/29 16:50:53 pnever Exp $
- * $Revision: 1.36 $
- * $Date: 2002/04/29 16:50:53 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.37 2002/04/30 12:39:19 pnever Exp $
+ * $Revision: 1.37 $
+ * $Date: 2002/04/30 12:39:19 $
*
* ====================================================================
*
@@ -316,7 +316,7 @@
revisionDescriptor = new NodeRevisionDescriptor(0);
}
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(resourcePath, revisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, resourcePath, revisionDescriptor);
// check preconditions
ViolatedPrecondition violatedPrecondition =
getPreconditionViolation(revisionDescriptors, revisionDescriptor, resourceKind);
1.45 +4 -4
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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- PutMethod.java 29 Apr 2002 16:50:53 -0000 1.44
+++ PutMethod.java 30 Apr 2002 12:39:19 -0000 1.45
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.44 2002/04/29 16:50:53 pnever Exp $
- * $Revision: 1.44 $
- * $Date: 2002/04/29 16:50:53 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.45 2002/04/30 12:39:19 pnever Exp $
+ * $Revision: 1.45 $
+ * $Date: 2002/04/30 12:39:19 $
*
* ====================================================================
*
@@ -225,7 +225,7 @@
revisionDescriptor.setContentLength(-1);
}
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(resourcePath, revisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, resourcePath, revisionDescriptor);
versioningHelper.isWriteLocked(slideToken, revisionDescriptors);
1.24 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java
Index: ReportMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ReportMethod.java 29 Apr 2002 16:50:53 -0000 1.23
+++ ReportMethod.java 30 Apr 2002 12:39:19 -0000 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.23 2002/04/29 16:50:53 pnever Exp $
- * $Revision: 1.23 $
- * $Date: 2002/04/29 16:50:53 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
1.24 2002/04/30 12:39:19 pnever Exp $
+ * $Revision: 1.24 $
+ * $Date: 2002/04/30 12:39:19 $
*
* ====================================================================
*
@@ -164,7 +164,7 @@
/**
* An implementation of the DeltaV <code>REPORT</code> method.
*
- * @version $Revision: 1.23 $
+ * @version $Revision: 1.24 $
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stuckert</a>
*/
@@ -1243,7 +1243,7 @@
else {
revisionDescriptors =
versioningHelper.retrieveRevisionDescriptors(child.getUri());
revisionDescriptor =
versioningHelper.retrieveLatestRevisionDescriptor(child.getUri(), revisionDescriptors);
- resourceKind =
AbstractResourceKind.determineResourceKind(child.getUri(), revisionDescriptor);
+ resourceKind = AbstractResourceKind.determineResourceKind(token,
child.getUri(), revisionDescriptor);
versionHistoryUri = null;
if (resourceKind instanceof VersionControlled) {
1.20 +4 -4
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- UnlockMethod.java 29 Apr 2002 16:50:53 -0000 1.19
+++ UnlockMethod.java 30 Apr 2002 12:39:19 -0000 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.19 2002/04/29 16:50:53 pnever Exp $
- * $Revision: 1.19 $
- * $Date: 2002/04/29 16:50:53 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.20 2002/04/30 12:39:19 pnever Exp $
+ * $Revision: 1.20 $
+ * $Date: 2002/04/30 12:39:19 $
*
* ====================================================================
*
@@ -179,7 +179,7 @@
// Check if resource must be checked in due to auto-versioning
// semantics.
- ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(requestUri, revisionDescriptor);
+ ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, requestUri, revisionDescriptor);
if( Configuration.useVersionControl() &&
(resourceKind instanceof CheckedOutVersionControlled) ) {
NodeProperty checkinLocktokenProperty =
revisionDescriptor.getProperty(VersioningHelper.P_CHECKIN_LOCKTOKEN);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
