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 2003/08/18 09:04:42 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind AbstractResourceKind.java

pnever      2003/08/18 00:04:42

  Modified:    src/webdav/server/org/apache/slide/webdav/util/resourcekind
                        AbstractResourceKind.java
  Log:
  Made DAV:workspace computed and added stuff for binding
  
  Revision  Changes    Path
  1.20      +13 -7     jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java
  
  Index: AbstractResourceKind.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- AbstractResourceKind.java	29 Oct 2002 13:10:59 -0000	1.19
  +++ AbstractResourceKind.java	18 Aug 2003 07:04:42 -0000	1.20
  @@ -78,6 +78,7 @@
   import org.apache.slide.content.NodeRevisionDescriptors;
   import org.apache.slide.util.Configuration;
   import org.apache.slide.webdav.util.AclConstants;
  +import org.apache.slide.webdav.util.BindConstants;
   import org.apache.slide.webdav.util.DaslConstants;
   import org.apache.slide.webdav.util.DeltavConstants;
   import org.apache.slide.webdav.util.UriHandler;
  @@ -89,7 +90,7 @@
   /**
    * Abstraction of a WebDAV-compliant resource kind.
    */
  -abstract public class AbstractResourceKind implements ResourceKind, WebdavConstants, DeltavConstants, AclConstants, DaslConstants {
  +abstract public class AbstractResourceKind implements ResourceKind, WebdavConstants, DeltavConstants, AclConstants, DaslConstants, BindConstants {
       
       /**
        ** String constant for an empty (<code>""</code>) string.
  @@ -178,6 +179,9 @@
               supportedFeatures.add( F_LABEL );
               supportedFeatures.add( F_UPDATE );
           }
  +        if (Configuration.useGlobalBinding()) {
  +            supportedFeatures.add( F_BINDING );
  +        }
           
           // Computed properties
           computedProperties.add( P_ACL);
  @@ -200,6 +204,7 @@
           computedProperties.add( P_SUPPORTED_REPORT_SET );        //"protected" in spec but too long for some datastores
           computedProperties.add( P_VERSION_CONTROLLED_CONFIGURATION );
           computedProperties.add( P_VERSION_HISTORY );
  +        computedProperties.add( P_WORKSPACE );                   //"protected" in spec but made computed for BIND
           computedProperties.add( P_WORKSPACE_CHECKOUT_SET );
           
           // Protected properties
  @@ -211,25 +216,26 @@
           protectedProperties.add( P_CHECKED_OUT );
           protectedProperties.add( P_CHECKOUT_SET ); //"computed" in spec but made protected for performance reasons
           protectedProperties.add( P_CREATIONDATE );
  -//        protectedProperties.add( P_GETCONTENTLANGUAGE ); // Should be modifiable
           protectedProperties.add( P_GETLASTMODIFIED );
  -        protectedProperties.add( P_GETCONTENTTYPE );
  +//        protectedProperties.add( P_GETCONTENTTYPE ); // so what ... let the client set the content-type via PROPPATCH
           protectedProperties.add( P_GETCONTENTLENGTH );
           protectedProperties.add( P_GETETAG );
           protectedProperties.add( P_LABEL_NAME_SET );
  +        protectedProperties.add( P_PARENT_SET );
           protectedProperties.add( P_PREDECESSOR_SET );
  +        protectedProperties.add( P_RESOURCE_ID );
           protectedProperties.add( P_RESOURCETYPE );
           protectedProperties.add( P_SOURCE );
           protectedProperties.add( P_SUBBASELINE_SET );
           protectedProperties.add( P_VERSION_CONTROLLED_BINDING_SET );
           protectedProperties.add( P_VERSION_NAME );
           protectedProperties.add( P_VERSION_SET );
  -        protectedProperties.add( P_WORKSPACE );
           
           // Live properties
           liveProperties.addAll( WebdavConstants.WEBDAV_PROPERTY_LIST );
           liveProperties.addAll( AclConstants.ACL_PROPERTY_LIST );
           liveProperties.addAll( DeltavConstants.DELTAV_PROPERTY_LIST );
  +        liveProperties.addAll( BindConstants.BIND_PROPERTY_LIST );
           
           // restricted property values
           RESTRICTED_PROPERTY_VALUE_MAP.put(P_AUTO_VERSION, SUPPORTED_AUTO_VERSION_ELEMENTS_LIST);