pnever 2002/11/27 05:15:48
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
At CHECKOUT, takeover DAV:displayname of WR from either the VCR
(auto-update) or the VR.
Revision Changes Path
1.83 +8 -4
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.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- VersioningHelper.java 4 Nov 2002 13:24:21 -0000 1.82
+++ VersioningHelper.java 27 Nov 2002 13:15:48 -0000 1.83
@@ -884,6 +884,7 @@
i = pHelp.createInitialProperties(WorkingImpl.getInstance()).iterator();
while( i.hasNext() )
wrNrd.setProperty( (NodeProperty)i.next() );
+ content.create( sToken, wrUri, wrNrd, rNrc );
// set specific live props
wrNrd.setProperty(
@@ -905,11 +906,14 @@
// set auto-update
if( autoUpdateUri != null && autoUpdateUri.length() > 0 ) {
+ UriHandler autoUpdateUh = new UriHandler( autoUpdateUri );
wrNrd.setProperty(
new NodeProperty(P_AUTO_UPDATE,
pHelp.createHrefValue(autoUpdateUri)) );
+ wrNrd.setName( autoUpdateUh.getName() );
}
else {
wrNrd.removeProperty( P_AUTO_UPDATE );
+ wrNrd.setName( rNrd.getName() );
}
// Copy dead properties VR -> WR
@@ -926,7 +930,7 @@
content.store( sToken, rNrds.getUri(), rNrd, null);
// store changes
- content.create( sToken, wrUri, wrNrd, rNrc );
+ content.store( sToken, wrUri, wrNrd, null );
// Set status created
resp.setStatus( WebdavStatus.SC_CREATED );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
