juergen 2002/10/09 02:26:40
Modified: src/webdav/server/org/apache/slide/webdav/method
PutMethod.java
Log:
Fixed bug:
Auto-version semantics now works for "locked-null-resources" also.
(ralf)
Revision Changes Path
1.58 +17 -3
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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- PutMethod.java 20 Sep 2002 15:21:02 -0000 1.57
+++ PutMethod.java 9 Oct 2002 09:26:40 -0000 1.58
@@ -189,6 +189,8 @@
try {
try {
+ boolean isLockedNullResource = false;
+
NodeRevisionDescriptors revisionDescriptors =
content.retrieve(slideToken, resourcePath);
@@ -261,6 +263,7 @@
if (revisionDescriptor.propertyValueContains
(revisionDescriptor.RESOURCE_TYPE ,"lock-null")){
// if (revisionDescriptor.getResourceType().equals("<lock-null/>")) {
+ isLockedNullResource = true;
revisionDescriptor.setContentLanguage("en");
String contentType = req.getContentType();
@@ -272,6 +275,13 @@
contentType = getConfig().getDefaultMimeType();
}
revisionDescriptor.setContentType(contentType);
+
+ // Changed for DeltaV --start--
+ if( Configuration.useVersionControl() ) {
+ // Workspace
+ versioningHelper.setWorkspaceProperty( resourcePath,
revisionDescriptor );
+ }
+ // Changed for DeltaV --end--
}
// Resource type
@@ -281,6 +291,10 @@
revisionContent);
// Changed for DeltaV --start--
+ // check if the resource should be put under version-control
+ if ( isLockedNullResource && Configuration.useVersionControl() &&
AUTO_VERSION_CONTROL ) {
+ versioningHelper.versionControl(resourcePath);
+ }
if( Configuration.useVersionControl() && mustCheckIn) {
versioningHelper.checkin(revisionDescriptors,
revisionDescriptor, false, false ); //forkOk=false, keepCheckedOut=false
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
