[prev in list] [next in list] [prev in thread] [next in thread]
List: slide-dev
Subject: cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method CopyMethod.java MoveMetho
From: pnever () apache ! org
Date: 2002-04-29 16:50:54
[Download RAW message or body]
pnever 02/04/29 09:50:54
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java MoveMethod.java PropFindMethod.java
PropPatchMethod.java PutMethod.java
ReportMethod.java UnlockMethod.java
Log:
Adapted to changed determineResourceKind() method
Revision Changes Path
1.29 +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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CopyMethod.java 25 Apr 2002 21:12:25 -0000 1.28
+++ CopyMethod.java 29 Apr 2002 16:50:53 -0000 1.29
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v \
1.28 2002/04/25 21:12:25 jericho Exp $
- * $Revision: 1.28 $
- * $Date: 2002/04/25 21:12:25 $
+ * $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 $
*
* ====================================================================
*
@@ -272,7 +272,7 @@
NodeRevisionDescriptors destinationRevisionDescriptors = \
versioningHelper.retrieveRevisionDescriptors(destinationUri); NodeRevisionDescriptor \
destinationRevisionDescriptor = \
versioningHelper.retrieveLatestRevisionDescriptor(destinationUri, \
destinationRevisionDescriptors);
- ResourceKind resourceKind = \
AbstractResourceKind.determineResourceKind(destinationRevisionDescriptor); + \
ResourceKind resourceKind = \
AbstractResourceKind.determineResourceKind(destinationUri, \
destinationRevisionDescriptor);
String checkedOutPropertyValue = \
(String)checkedOutDestinationsMap.get(destinationUri); if (checkedOutPropertyValue \
!= null) { @@ -363,7 +363,7 @@
if (destinationExists) {
- ResourceKind resourceKind = \
AbstractResourceKind.determineResourceKind(revisionDescriptor); + \
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(targetUri, \
revisionDescriptor);
if (resourceKind instanceof CheckedInVersionControlled) {
// check precondition \
DAV:cannot-modify-version-controlled-content
1.32 +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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- MoveMethod.java 26 Apr 2002 13:56:13 -0000 1.31
+++ MoveMethod.java 29 Apr 2002 16:50:53 -0000 1.32
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v \
1.31 2002/04/26 13:56:13 juergen Exp $
- * $Revision: 1.31 $
- * $Date: 2002/04/26 13:56:13 $
+ * $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 $
*
* ====================================================================
*
@@ -280,7 +280,7 @@
catch( ObjectNotFoundException e ) {}; // can be ignored here!
ResourceKind destinationResourceKind =
- AbstractResourceKind.determineResourceKind( \
destinationRevisionDescriptor ); + \
AbstractResourceKind.determineResourceKind( destinationUri, \
destinationRevisionDescriptor );
if( !(destinationResourceKind instanceof \
DeltavCompliantUnmappedUrl) ) {
return new ViolatedPrecondition(C_RESOURCE_MUST_BE_NULL,
1.63 +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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- PropFindMethod.java 26 Apr 2002 12:45:52 -0000 1.62
+++ PropFindMethod.java 29 Apr 2002 16:50:53 -0000 1.63
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v \
1.62 2002/04/26 12:45:52 pnever Exp $
- * $Revision: 1.62 $
- * $Date: 2002/04/26 12:45:52 $
+ * $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 $
*
* ====================================================================
*
@@ -508,7 +508,7 @@
Element propElement = new Element(E_PROPSTAT, \
Namespace.getNamespace(DEFAULT_NAMESPACE)); propstatElement.addContent(propElement);
- ResourceKind resourceKind = \
AbstractResourceKind.determineResourceKind(revisionDescriptor); + \
ResourceKind resourceKind = \
AbstractResourceKind.determineResourceKind(object.getUri(), revisionDescriptor); \
String[] filter = null; if ( ! Configuration.useIntegratedSecurity() ) {
filter = new String[] {F_ACCESS_CONTROL};
1.36 +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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- PropPatchMethod.java 25 Apr 2002 21:27:31 -0000 1.35
+++ PropPatchMethod.java 29 Apr 2002 16:50:53 -0000 1.36
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v \
1.35 2002/04/25 21:27:31 jericho Exp $
- * $Revision: 1.35 $
- * $Date: 2002/04/25 21:27:31 $
+ * $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 $
*
* ====================================================================
*
@@ -316,7 +316,7 @@
revisionDescriptor = new NodeRevisionDescriptor(0);
}
- ResourceKind resourceKind = \
AbstractResourceKind.determineResourceKind(revisionDescriptor); + \
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(resourcePath, \
revisionDescriptor);
// check preconditions
ViolatedPrecondition violatedPrecondition = \
getPreconditionViolation(revisionDescriptors, revisionDescriptor, resourceKind);
1.44 +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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- PutMethod.java 25 Apr 2002 21:27:31 -0000 1.43
+++ PutMethod.java 29 Apr 2002 16:50:53 -0000 1.44
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v \
1.43 2002/04/25 21:27:31 jericho Exp $
- * $Revision: 1.43 $
- * $Date: 2002/04/25 21:27:31 $
+ * $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 $
*
* ====================================================================
*
@@ -225,7 +225,7 @@
revisionDescriptor.setContentLength(-1);
}
- ResourceKind resourceKind = \
AbstractResourceKind.determineResourceKind(revisionDescriptor); + \
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(resourcePath, \
revisionDescriptor);
versioningHelper.isWriteLocked(slideToken, revisionDescriptors);
1.23 +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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ReportMethod.java 26 Apr 2002 15:19:12 -0000 1.22
+++ ReportMethod.java 29 Apr 2002 16:50:53 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v \
1.22 2002/04/26 15:19:12 wam Exp $
- * $Revision: 1.22 $
- * $Date: 2002/04/26 15:19:12 $
+ * $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 $
*
* ====================================================================
*
@@ -164,7 +164,7 @@
/**
* An implementation of the DeltaV <code>REPORT</code> method.
*
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.23 $
*
* @author <a href="mailto:ralf.stuckert@softwareag.com">Ralf Stuckert</a>
*/
@@ -1243,7 +1243,7 @@
else {
revisionDescriptors = \
versioningHelper.retrieveRevisionDescriptors(child.getUri());
revisionDescriptor = \
versioningHelper.retrieveLatestRevisionDescriptor(child.getUri(), \
revisionDescriptors);
- resourceKind = \
AbstractResourceKind.determineResourceKind(revisionDescriptor); + \
resourceKind = AbstractResourceKind.determineResourceKind(child.getUri(), \
revisionDescriptor); versionHistoryUri = null;
if (resourceKind instanceof VersionControlled) {
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- UnlockMethod.java 25 Apr 2002 21:15:15 -0000 1.18
+++ UnlockMethod.java 29 Apr 2002 16:50:53 -0000 1.19
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v \
1.18 2002/04/25 21:15:15 jericho Exp $
- * $Revision: 1.18 $
- * $Date: 2002/04/25 21:15:15 $
+ * $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 $
*
* ====================================================================
*
@@ -179,7 +179,7 @@
// Check if resource must be checked in due to auto-versioning
// semantics.
- ResourceKind resourceKind = \
AbstractResourceKind.determineResourceKind(revisionDescriptor); + \
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(requestUri, \
revisionDescriptor); if( Configuration.useVersionControl() &&
(resourceKind instanceof CheckedOutVersionControlled) ) {
NodeProperty checkinLocktokenProperty = \
revisionDescriptor.getProperty(VersioningHelper.P_CHECKIN_LOCKTOKEN);
--
To unsubscribe, e-mail: <mailto:slide-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:slide-dev-help@jakarta.apache.org>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic