pnever 02/02/28 04:39:01
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Make use of new resource kind classes
Revision Changes Path
1.2 +14 -21
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VersioningHelper.java 26 Feb 2002 11:52:16 -0000 1.1
+++ VersioningHelper.java 28 Feb 2002 12:39:01 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.1 2002/02/26 11:52:16 pnever Exp $
- * $Revision: 1.1 $
- * $Date: 2002/02/26 11:52:16 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.2 2002/02/28 12:39:01 pnever Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/28 12:39:01 $
*
* ====================================================================
*
@@ -86,9 +86,9 @@
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.util.PropertyHelper;
-import org.apache.slide.webdav.util.MethodHelper;
import org.apache.slide.webdav.util.UriHandler;
import org.apache.slide.webdav.util.DeltavConstants;
+import org.apache.slide.webdav.util.resourcekind.*;
import org.apache.util.WebdavStatus;
import org.apache.slide.common.SlideException;
@@ -138,7 +138,6 @@
public void versionControl( String resourcePath ) throws SlideException {
UriHandler uh = UriHandler.getUriHandler( nsaToken, resourcePath );
PropertyHelper ph = PropertyHelper.getPropertyHelper( sToken,nsaToken );
- MethodHelper mh = MethodHelper.getMethodHelper( sToken,nsaToken );
Iterator i;
String realPath = resourcePath;
@@ -148,15 +147,15 @@
NodeRevisionDescriptors vcrNrds = content.retrieve( sToken, realPath );
NodeRevisionDescriptor vcrNrd = content.retrieve( sToken, vcrNrds );
NodeRevisionContent vcrNrc = content.retrieve( sToken, vcrNrds, vcrNrd );
- String resourceKind = mh.determineResourceKind( vcrNrd );
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(
vcrNrd );
- if( !mh.isSupportedMethod(req.getMethod(), resourceKind) ) {
+ if( !resourceKind.isSupportedMethod(req.getMethod()) ) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
return;
}
// Check for resourceKind = K_VERSION_CONTROLLED*
- if( resourceKind == K_VERSION_CONTROLLED ) {
+ if( resourceKind instanceof VersionControlled ) {
// nothing to do
resp.setStatus(WebdavStatus.SC_OK);
return;
@@ -165,7 +164,7 @@
// Set initial VR properties
NodeRevisionDescriptor vrNrd =
new NodeRevisionDescriptor(req.getContentLength());
- i = ph.createInitialProperties(K_VERSION).iterator();
+ i = ph.createInitialProperties(VersionImpl.getInstance()).iterator();
while( i.hasNext() )
vrNrd.setProperty( (NodeProperty)i.next() );
@@ -176,12 +175,12 @@
String vhrBranch = NodeRevisionDescriptors.MAIN_BRANCH;
NodeRevisionDescriptor vhrNrd =
new NodeRevisionDescriptor( vhrNrn, vhrBranch, vhrLabels, vhrProps );
- i = ph.createInitialProperties(K_VERSION_HISTORY).iterator();
+ i = ph.createInitialProperties(VersionHistoryImpl.getInstance()).iterator();
while( i.hasNext() )
vhrNrd.setProperty( (NodeProperty)i.next() );
// Set initial VCR properties (do not overwrite existing!!)
- i = ph.createInitialProperties(K_VERSION_CONTROLLED).iterator();
+ i =
ph.createInitialProperties(VersionControlledImpl.getInstance()).iterator();
while( i.hasNext() ) {
NodeProperty p = (NodeProperty)i.next();
if( !vcrNrd.exists(p.getName()) )
@@ -211,8 +210,6 @@
// Set specific properties
// First VCR ...
vcrNrd.setProperty(
- new NodeProperty(P_VERSION_HISTORY, ph.createHrefValue(vhrUriStr)) );
- vcrNrd.setProperty(
new NodeProperty(P_CHECKED_IN, ph.createHrefValue(vrUriStr)) );
// ... then VHR ...
vhrNrd.setETag( vhrUriStr.hashCode()+"_" ); // P_GETETAG
@@ -221,8 +218,6 @@
vhrNrd.setName( vhrUri.getHistoryName() ); // P_DISPLAYNAME
vhrNrd.setProperty(
new NodeProperty(P_VERSION_SET, ph.createHrefValue(vrUriStr)) );
- vhrNrd.setProperty(
- new NodeProperty(P_ROOT_VERSION, ph.createHrefValue(vrUriStr)) );
// ... and finally VR ...
/* Content Type --start-- */
String contentType = req.getContentType();
@@ -258,7 +253,6 @@
UriHandler uh = UriHandler.getUriHandler( nsaToken, resourcePath );
PropertyHelper ph = PropertyHelper.getPropertyHelper( sToken,nsaToken );
- MethodHelper mh = MethodHelper.getMethodHelper( sToken,nsaToken );
Iterator i;
String realPath = resourcePath;
@@ -267,12 +261,11 @@
NodeRevisionDescriptors vcrNrds = content.retrieve( sToken, realPath );
NodeRevisionDescriptor vcrNrd = content.retrieve( sToken, vcrNrds );
- String resourceKind = mh.determineResourceKind( vcrNrd );
+ ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(
vcrNrd );
- if( !mh.isSupportedMethod(req.getMethod(), resourceKind) ) {
+ if( !resourceKind.isSupportedMethod(req.getMethod()) ) {
// check precondition C_MUST_BE_CHECKED_IN
- if( resourceKind == K_CHECKED_OUT_VERSION_CONTROLLED ||
- resourceKind == K_CHECKED_OUT )
+ if( resourceKind instanceof CheckedOut )
{
resp.setStatus(WebdavStatus.SC_CONFLICT);
// TODO: set response error element
@@ -282,7 +275,7 @@
return;
}
- if( resourceKind == K_CHECKED_IN_VERSION_CONTROLLED ) {
+ if( resourceKind instanceof CheckedInVersionControlled ) {
NodeProperty cinProp = vcrNrd.getProperty( P_CHECKED_IN );
// TODO: check precondition
C_CHECKOUT_OF_VERSION_WITH_DESCENDANT_IS_FORBIDDEN
// TODO: check precondition
C_CHECKOUT_OF_VERSION_WITH_DESCENDANT_IS_DISCOURAGED
@@ -296,7 +289,7 @@
vcrNrd.setProperty(
new NodeProperty(P_PREDECESSOR_SET, cinProp.getValue()) );
}
- else if( resourceKind == K_VERSION ) {
+ else if( resourceKind instanceof Version ) {
Domain.info(
"Working resource feature NOT YET IMPLEMENTED" );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
