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/11/04 14:24:21 UTC

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

pnever      2002/11/04 05:24:21

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        VersioningHelper.java
  Log:
  Fixed bug with DAV:displayname of VRs
  
  Revision  Changes    Path
  1.82      +5 -5      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.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- VersioningHelper.java	31 Oct 2002 14:50:10 -0000	1.81
  +++ VersioningHelper.java	4 Nov 2002 13:24:21 -0000	1.82
  @@ -296,7 +296,6 @@
           vrNrd.setContentType(rNrd.getContentType()); // P_GETCONTENTTYPE
           vrNrd.setContentLength(rNrd.getContentLength()); // P_GETCONTENTLENGTH
           vrNrd.setContentLanguage(rNrd.getContentLanguage()); // P_GETCONTENTLANGUAGE
  -        vrNrd.setName(rNrd.getName()); // P_DISPLAYNAME
           String comment = "INITIAL VERSION. ";
           if( rNrd.exists(P_COMMENT) )
               comment += (String)rNrd.getProperty(P_COMMENT).getValue();
  @@ -342,6 +341,7 @@
           structure.create( sToken, vrNode, String.valueOf(vrUh) );
           
           // Set specific properties
  +        vrNrd.setName(rNrd.getName()); // P_DISPLAYNAME
           rNrd.setProperty(
               new NodeProperty(P_CHECKED_IN, pHelp.createHrefValue(vrUri)) );
           vhrNrd.setETag( vhrUri.hashCode()+"_" ); // P_GETETAG
  @@ -1189,7 +1189,6 @@
               vrNrdNew.setContentType(rNrd.getContentType()); // P_GETCONTENTTYPE
               vrNrdNew.setContentLength(rNrd.getContentLength()); // P_GETCONTENTLENGTH
               vrNrdNew.setContentLanguage( rNrd.getContentLanguage() ); // P_GETCONTENTLANGUAGE
  -            vrNrdNew.setName( rNrd.getName() ); // P_DISPLAYNAME
               String comment = (autoVersion ? "CREATED BY AUTO-VERSIONING. " : "");
               if( rNrd.exists(P_COMMENT) )
                   comment += (String)rNrd.getProperty(P_COMMENT).getValue();
  @@ -1239,6 +1238,7 @@
               vhrNrd.setProperty( new NodeProperty(
                                      P_VERSION_SET, ((String)vSetProp.getValue())+pHelp.createHrefValue(vrUriNew)) );
               
  +            vrNrdNew.setName( rNrd.getName() ); // P_DISPLAYNAME
               vrNrdNew.setETag( vrUriNew.hashCode()+"_"+req.getContentLength() ); // P_GETETAG
               vrNrdNew.setCreationDate( new Date() ); // P_CREATIONDATE
               vrNrdNew.setLastModified( new Date() ); // P_GETLASTMODIFIED
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>