juergen 02/03/13 02:08:38
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Fixed bug in method checkin:
Set content-type of VR's NodeRevisionDescriptor before calling Content.create()
otherwise TaminoAPI will throw a PreconditionViolation for non-XML content.
(ralf)
Revision Changes Path
1.5 +6 -13
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VersioningHelper.java 8 Mar 2002 11:59:05 -0000 1.4
+++ VersioningHelper.java 13 Mar 2002 10:08:38 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.4 2002/03/08 11:59:05 juergen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/03/08 11:59:05 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.5 2002/03/13 10:08:38 juergen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/03/13 10:08:38 $
*
* ====================================================================
*
@@ -434,6 +434,9 @@
if( !vrNrdNew.exists(p.getName()) )
vrNrdNew.setProperty( p );
}
+ // Copy content-type VCR->VR
+ vrNrdNew.setContentType(rNrd.getContentType()); // P_GETCONTENTTYPE
+
content.create( sToken, vhrUri, vrNrdNew, rNrc );
String vrUriNew = vhrUri+"/"+vrNrdNew.getRevisionNumber().toString();
UriHandler vrUhNew = new UriHandler( nsaToken.getName(), vrUriNew );
@@ -447,16 +450,6 @@
vhrNrd.setLastModified( new Date() ); // P_GETLASTMODIFIED
vhrNrd.setProperty( new NodeProperty(
P_VERSION_SET,
((String)vSetProp.getValue())+pHelp.createHrefValue(vrUriNew)) );
- /* Content Type --start-- */
- String contentType = req.getContentType();
- if (contentType == null) {
- contentType = sConf.getServletContext()
- .getMimeType(rNrds.getUri());
- }
- if (contentType == null) {
- contentType = sConf.getDefaultMimeType();
- }
- vrNrdNew.setContentType(contentType); // P_GETCONTENTTYPE
/* Content Type --end-- */
vrNrdNew.setName(
(String)pHelp.createCdataValue(vrUhNew.getVersionName()) ); // P_DISPLAYNAME
vrNrdNew.setETag( vrUriNew.hashCode()+"_"+req.getContentLength() ); //
P_GETETAG
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
