juergen 02/05/17 05:42:45
Modified: src/webdav/server/org/apache/slide/webdav/util
UriHandler.java
Log:
Internal properties <next-history-name> and <next-workingresource-name> are now in
the Slide namespace. Added code for smooth migration.
(ralf)
Revision Changes Path
1.12 +45 -11
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java
Index: UriHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UriHandler.java 30 Apr 2002 12:39:58 -0000 1.11
+++ UriHandler.java 17 May 2002 12:42:45 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
1.11 2002/04/30 12:39:58 pnever Exp $
- * $Revision: 1.11 $
- * $Date: 2002/04/30 12:39:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
1.12 2002/05/17 12:42:45 juergen Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/05/17 12:42:45 $
*
* ====================================================================
*
@@ -72,6 +72,7 @@
import org.apache.slide.structure.LinkedObjectNotFoundException;
import org.apache.slide.content.Content;
import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionNumber;
@@ -168,10 +169,25 @@
NodeRevisionDescriptor hpathNrd =
content.retrieve( sToken, hpathNrds );
- NodeProperty nextHnProp = hpathNrd.getProperty( I_NEXT_HISTORY_NAME );
+ NodeProperty nextHnProp = hpathNrd.getProperty(I_NEXT_HISTORY_NAME,
+ NamespaceCache.SLIDE_URI);
+ if (nextHnProp == null) {
+ // convert to slide namespace if this property is still
+ // in DAV: namespace
+ nextHnProp = hpathNrd.getProperty( I_NEXT_HISTORY_NAME );
+ if (nextHnProp != null) {
+ hpathNrd.removeProperty(nextHnProp);
+ nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME,
+ nextHnProp.getValue(),
+ NamespaceCache.SLIDE_URI);
+ hpathNrd.setProperty( nextHnProp );
+ }
+ }
if( nextHnProp == null || nextHnProp.getValue() == null ) {
nextHnProp =
- new NodeProperty( I_NEXT_HISTORY_NAME, I_INITIAL_HISTORY_NAME );
+ new NodeProperty(I_NEXT_HISTORY_NAME,
+ I_INITIAL_HISTORY_NAME,
+ NamespaceCache.SLIDE_URI);
hpathNrd.setProperty( nextHnProp );
}
@@ -180,8 +196,9 @@
nsName, hpath+"/"+nextHnStr );
long nextHnLong = Long.parseLong( nextHnStr );
- nextHnProp = new NodeProperty(
- I_NEXT_HISTORY_NAME, String.valueOf(nextHnLong + 1) );
+ nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME,
+ String.valueOf(nextHnLong + 1),
+ NamespaceCache.SLIDE_URI );
hpathNrd.setProperty( nextHnProp );
content.store( sToken, hpath, hpathNrd, null ); //revisionContent = null
@@ -211,10 +228,26 @@
NodeRevisionDescriptor wrpathNrd =
content.retrieve( sToken, wrpathNrds );
- NodeProperty nextWrnProp = wrpathNrd.getProperty(
I_NEXT_WORKINGRESOURCE_NAME );
+ NodeProperty nextWrnProp =
wrpathNrd.getProperty(I_NEXT_WORKINGRESOURCE_NAME,
+ NamespaceCache.SLIDE_URI);
+ if (nextWrnProp == null) {
+ // convert to slide namespace if this property is still
+ // in DAV: namespace
+ nextWrnProp = wrpathNrd.getProperty( I_NEXT_WORKINGRESOURCE_NAME );
+ if (nextWrnProp != null) {
+ wrpathNrd.removeProperty(nextWrnProp);
+ nextWrnProp = new NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
+ nextWrnProp.getValue(),
+ NamespaceCache.SLIDE_URI);
+ wrpathNrd.setProperty( nextWrnProp );
+ }
+ }
+
if( nextWrnProp == null || nextWrnProp.getValue() == null ) {
nextWrnProp =
- new NodeProperty( I_NEXT_WORKINGRESOURCE_NAME,
I_INITIAL_WORKINGRESOURCE_NAME );
+ new NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
+ I_INITIAL_WORKINGRESOURCE_NAME,
+ NamespaceCache.SLIDE_URI );
wrpathNrd.setProperty( nextWrnProp );
}
@@ -223,8 +256,9 @@
nsName, wrpath+"/"+nextWrnStr );
long nextWrnLong = Long.parseLong( nextWrnStr );
- nextWrnProp = new NodeProperty(
- I_NEXT_WORKINGRESOURCE_NAME, String.valueOf(nextWrnLong + 1) );
+ nextWrnProp = new NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
+ String.valueOf(nextWrnLong + 1),
+ NamespaceCache.SLIDE_URI );
wrpathNrd.setProperty( nextWrnProp );
content.store( sToken, wrpath, wrpathNrd, null ); //revisionContent = null
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
