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/05/01 17:04:56 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util VersioningHelper.java
pnever 02/05/01 08:04:56
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Revised update() method
Revision Changes Path
1.42 +12 -9 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- VersioningHelper.java 30 Apr 2002 12:39:40 -0000 1.41
+++ VersioningHelper.java 1 May 2002 15:04:56 -0000 1.42
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v 1.41 2002/04/30 12:39:40 pnever Exp $
- * $Revision: 1.41 $
- * $Date: 2002/04/30 12:39:40 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v 1.42 2002/05/01 15:04:56 pnever Exp $
+ * $Revision: 1.42 $
+ * $Date: 2002/05/01 15:04:56 $
*
* ====================================================================
*
@@ -1150,7 +1150,7 @@
*
* @throws SlideException
*/
- protected void updateVCR(String vcrUri, String vrUri) throws SlideException {
+ public void update(String vcrUri, String vrUri) throws SlideException {
NodeRevisionDescriptors vcrRevisionDescriptors = retrieveRevisionDescriptors(vcrUri);
NodeRevisionDescriptor vcrRevisionDescriptor = retrieveLatestRevisionDescriptor(vcrUri, vcrRevisionDescriptors);
@@ -1158,7 +1158,7 @@
NodeRevisionDescriptors vrRevisionDescriptors = retrieveRevisionDescriptors(vrUri);
NodeRevisionDescriptor vrRevisionDescriptor = retrieveLatestRevisionDescriptor(vrUri, vrRevisionDescriptors);
- updateVCR(vcrRevisionDescriptors, vcrRevisionDescriptor, vrRevisionDescriptors, vrRevisionDescriptor);
+ update(vcrRevisionDescriptors, vcrRevisionDescriptor, vrRevisionDescriptors, vrRevisionDescriptor);
}
/**
@@ -1178,19 +1178,22 @@
*
* @throws SlideException
*/
- protected void updateVCR(NodeRevisionDescriptors vcrRevisionDescriptors, NodeRevisionDescriptor vcrRevisionDescriptor, NodeRevisionDescriptors vrRevisionDescriptors, NodeRevisionDescriptor vrRevisionDescriptor) throws SlideException {
+ public void update(NodeRevisionDescriptors vcrRevisionDescriptors, NodeRevisionDescriptor vcrRevisionDescriptor, NodeRevisionDescriptors vrRevisionDescriptors, NodeRevisionDescriptor vrRevisionDescriptor) throws SlideException {
ResourceKind vrResourceKind = VersionImpl.getInstance();
+ ResourceKind cinvcrResourceKind = CheckedInVersionControlledImpl.getInstance();
String vcrUri = getUri(vcrRevisionDescriptors, vcrRevisionDescriptor);
Enumeration propertyEnum;
- // Remove all VCR properties first
+ // Remove all VCR dead properties first
// Well, almost all ... a property named xdavContentId will be skipped ...
- // This is Tamino-specific but shouldn't hurt others.
+ // This is a TEMPORARY Tamino-specific workaround which shouldn't hurt others.
// Sorry for this :-) !!
propertyEnum = vcrRevisionDescriptor.enumerateProperties();
while (propertyEnum.hasMoreElements()) {
NodeProperty p = (NodeProperty)propertyEnum.nextElement();
+ if( cinvcrResourceKind.isSupportedLiveProperty(p.getName()) )
+ continue;
if( p.getName().equals("xdavContentId") )
continue;
vcrRevisionDescriptor.removeProperty(p);
@@ -1204,7 +1207,7 @@
// Copy all dead properties of VR to VCR
// Well, almost all ... a property named xdavContentId will be skipped ...
- // Again, this is Tamino-specific but shouldn't hurt others.
+ // Again, this is TEMPORARAY and shouldn't hurt others.
// Sorry again for this :-) !!
propertyEnum = vrRevisionDescriptor.enumerateProperties();
while (propertyEnum.hasMoreElements()) {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>