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 pn...@apache.org on 2002/04/13 16:53:40 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method MkcolMethod.java PutMethod.java
pnever 02/04/13 07:53:39
Modified: src/webdav/server/org/apache/slide/webdav/method
MkcolMethod.java PutMethod.java
Log:
Set workspace property if resource is created in a workspace
Revision Changes Path
1.20 +19 -4 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MkcolMethod.java 28 Mar 2002 06:12:12 -0000 1.19
+++ MkcolMethod.java 13 Apr 2002 14:53:39 -0000 1.20
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v 1.19 2002/03/28 06:12:12 jericho Exp $
- * $Revision: 1.19 $
- * $Date: 2002/03/28 06:12:12 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v 1.20 2002/04/13 14:53:39 pnever Exp $
+ * $Revision: 1.20 $
+ * $Date: 2002/04/13 14:53:39 $
*
* ====================================================================
*
@@ -77,13 +77,18 @@
import org.apache.slide.content.*;
import org.apache.slide.lock.*;
import org.apache.slide.security.AccessDeniedException;
+import org.apache.slide.util.Configuration;
+import org.apache.slide.webdav.util.VersioningHelper;
+import org.apache.slide.webdav.util.DeltavConstants;
+
/**
* MKCOL method.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
*/
-public class MkcolMethod extends WebdavMethod {
+public class MkcolMethod extends WebdavMethod
+implements DeltavConstants {
// -------------------------------------------------------------- Constants
@@ -170,6 +175,16 @@
// Owner
revisionDescriptor.setOwner(
slideToken.getCredentialsToken().getPublicCredentials());
+
+ // Added for DeltaV --start--
+ if( Configuration.useVersionControl() ) {
+ VersioningHelper vHelp = VersioningHelper.getVersioningHelper(
+ slideToken, token, req, resp, getConfig() );
+
+ // Workspace
+ vHelp.setWorkspaceProperty( colName, revisionDescriptor );
+ }
+ // Added for DeltaV --end--
if (isMsProprietarySupport()) {
1.41 +16 -10 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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- PutMethod.java 10 Apr 2002 07:25:37 -0000 1.40
+++ PutMethod.java 13 Apr 2002 14:53:39 -0000 1.41
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.40 2002/04/10 07:25:37 juergen Exp $
- * $Revision: 1.40 $
- * $Date: 2002/04/10 07:25:37 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.41 2002/04/13 14:53:39 pnever Exp $
+ * $Revision: 1.41 $
+ * $Date: 2002/04/13 14:53:39 $
*
* ====================================================================
*
@@ -169,8 +169,6 @@
try {
- VersioningHelper vHelp = VersioningHelper.getVersioningHelper(
- slideToken, token, req, resp, getConfig() );
try {
// Changed for DeltaV --start--
// NodeRevisionDescriptors revisionDescriptors =
@@ -183,7 +181,7 @@
}
else {
revisionDescriptors =
- vHelp.retrieveRevisionDescriptors( resourcePath );
+ versioningHelper.retrieveRevisionDescriptors( resourcePath );
}
// Changed for DeltaV --end--
@@ -200,7 +198,7 @@
(slideToken, revisionDescriptors);
}
else {
- oldRevisionDescriptor = vHelp.retrieveLatestRevisionDescriptor(
+ oldRevisionDescriptor = versioningHelper.retrieveLatestRevisionDescriptor(
resourcePath, revisionDescriptors );
}
// Changed for DeltaV --end--
@@ -236,7 +234,7 @@
(resourceKind instanceof CheckedInVersionControlled) &&
versioningHelper.mustCheckoutAutoVersionedVCR(revisionDescriptors, revisionDescriptor) ) {
- vHelp.checkout(revisionDescriptors, revisionDescriptor, false, false, true );
+ versioningHelper.checkout(revisionDescriptors, revisionDescriptor, false, false, true );
mustCheckIn = versioningHelper.mustCheckinAutoVersionedVCR(slideToken, revisionDescriptors, revisionDescriptor);
}
// Changed for DeltaV --end--
@@ -288,7 +286,7 @@
// Changed for DeltaV --start--
if( Configuration.useVersionControl() && mustCheckIn) {
- vHelp.checkin(revisionDescriptors, revisionDescriptor, false, false ); //forkOk=false, keepCheckedOut=false
+ versioningHelper.checkin(revisionDescriptors, revisionDescriptor, false, false ); //forkOk=false, keepCheckedOut=false
}
// Changed for DeltaV --end--
@@ -351,6 +349,13 @@
slideToken.getCredentialsToken().
getPublicCredentials());
+ // Added for DeltaV --start--
+ if( Configuration.useVersionControl() ) {
+ // Workspace
+ versioningHelper.setWorkspaceProperty( resourcePath, revisionDescriptor );
+ }
+ // Added for DeltaV --end--
+
if (isMsProprietarySupport()) {
NodeProperty property = null;
// Is hidden
@@ -386,7 +391,7 @@
// check if the resource should be put under version-control
if ( Configuration.useVersionControl() &&
token.getNamespaceConfig().getAutoVersionControl() ) {
- vHelp.versionControl(resourcePath);
+ versioningHelper.versionControl(resourcePath);
}
resp.setStatus(WebdavStatus.SC_CREATED);
@@ -489,4 +494,5 @@
}
+
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>