luetzkendorf 2004/12/21 08:17:05
Modified: src/webdav/server/org/apache/slide/webdav/util
DeltavConstants.java DirectoryIndexGenerator.java
PropertyHelper.java UnlockListenerImpl.java
UriHandler.java VersioningHelper.java
Log:
use of PropertyName objects instead of simple Strings
Revision Changes Path
1.34 +8 -0
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java
Index: DeltavConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DeltavConstants.java 15 Dec 2004 18:03:02 -0000 1.33
+++ DeltavConstants.java 21 Dec 2004 16:17:04 -0000 1.34
@@ -28,6 +28,7 @@
import java.util.List;
import org.apache.slide.common.PropertyName;
+import org.apache.slide.content.NodeProperty;
/**
* DeltaV constants.
@@ -245,6 +246,13 @@
PropertyName PN_VERSION_SET =
PropertyName.getPropertyName(P_VERSION_SET);
PropertyName PN_WORKSPACE =
PropertyName.getPropertyName(P_WORKSPACE);
PropertyName PN_WORKSPACE_CHECKOUT_SET =
PropertyName.getPropertyName(P_WORKSPACE_CHECKOUT_SET);
+
+ PropertyName PN_CHECKIN_LOCKTOKEN =
PropertyName.getPropertyName(I_CHECKIN_LOCKTOKEN, NodeProperty.SLIDE_NAMESPACE);
+ PropertyName PN_CHECKIN_LOCKTOKEN_COMP =
PropertyName.getPropertyName(I_CHECKIN_LOCKTOKEN,
NodeProperty.DEFAULT_NAMESPACE);
+ PropertyName PN_NEXT_HISTORY_NAME =
PropertyName.getPropertyName(I_NEXT_HISTORY_NAME, NodeProperty.SLIDE_NAMESPACE);
+ PropertyName PN_NEXT_HISTORY_NAME_COMP =
PropertyName.getPropertyName(I_NEXT_HISTORY_NAME,
NodeProperty.DEFAULT_NAMESPACE);
+ PropertyName PN_NEXT_WORKINGRESOURCE_NAME =
PropertyName.getPropertyName(I_NEXT_WORKINGRESOURCE_NAME,
NodeProperty.SLIDE_NAMESPACE);
+ PropertyName PN_NEXT_WORKINGRESOURCE_NAME_COMP =
PropertyName.getPropertyName(I_NEXT_WORKINGRESOURCE_NAME,
NodeProperty.DEFAULT_NAMESPACE);
/** Methods */
String M_BASELINE_CONTROL =
"BASELINE-CONTROL";
1.15 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java
Index: DirectoryIndexGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DirectoryIndexGenerator.java 11 Dec 2004 04:21:15 -0000 1.14
+++ DirectoryIndexGenerator.java 21 Dec 2004 16:17:04 -0000 1.15
@@ -303,7 +303,7 @@
writer.print("\"><tt>");
NodeProperty displayname = null;
if (currentDescriptor != null) {
- displayname = currentDescriptor.getProperty("displayname");
+ displayname =
currentDescriptor.getProperty(WebdavConstants.PN_DISPLAYNAME);
}
if (displayname != null)
writer.print(stringToCharacterRef((String)displayname.getValue()));
1.87 +3 -39
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- PropertyHelper.java 15 Dec 2004 18:03:02 -0000 1.86
+++ PropertyHelper.java 21 Dec 2004 16:17:04 -0000 1.87
@@ -26,76 +26,40 @@
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.commons.codec.digest.DigestUtils;
+
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
-import org.apache.slide.common.NamespaceConfig;
import org.apache.slide.common.PropertyName;
-import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.Uri;
-import org.apache.slide.common.UriPath;
import org.apache.slide.content.Content;
import org.apache.slide.content.NodeProperty;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeRevisionNumber;
-import org.apache.slide.content.RevisionDescriptorNotFoundException;
import org.apache.slide.content.NodeProperty.NamespaceCache;
-import org.apache.slide.event.VetoException;
-import org.apache.slide.lock.Lock;
-import org.apache.slide.lock.LockTokenNotFoundException;
import org.apache.slide.lock.NodeLock;
-import org.apache.slide.lock.ObjectLockedException;
-import org.apache.slide.search.RequestedResource;
-import org.apache.slide.search.Search;
-import org.apache.slide.search.SearchQuery;
-import org.apache.slide.search.SearchQueryResult;
-import org.apache.slide.security.ACLSecurityImpl;
-import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.security.NodePermission;
-import org.apache.slide.security.Security;
-import org.apache.slide.security.SecurityImpl;
-import org.apache.slide.structure.ActionNode;
-import org.apache.slide.structure.LinkedObjectNotFoundException;
-import org.apache.slide.structure.ObjectNode;
-import org.apache.slide.structure.ObjectNotFoundException;
-import org.apache.slide.structure.Structure;
import org.apache.slide.structure.SubjectNode;
-import org.apache.slide.util.Configuration;
import org.apache.slide.util.XMLValue;
import org.apache.slide.webdav.WebdavServletConfig;
-import org.apache.slide.webdav.method.LockMethod;
import org.apache.slide.webdav.util.properties.LockDiscoveryProperty;
-import org.apache.slide.webdav.util.properties.PropertyDefinition;
+import org.apache.slide.webdav.util.properties.PropertyComputer;
import org.apache.slide.webdav.util.properties.PropertyManager;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.Activity;
-import org.apache.slide.webdav.util.resourcekind.CheckedInVersionControlled;
-import org.apache.slide.webdav.util.resourcekind.CheckedOutVersionControlled;
import org.apache.slide.webdav.util.resourcekind.DeltavCompliantCollection;
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
-import org.apache.slide.webdav.util.resourcekind.Version;
import org.apache.slide.webdav.util.resourcekind.VersionHistory;
-import org.apache.slide.webdav.util.resourcekind.Workspace;
import org.jdom.Attribute;
-import org.jdom.CDATA;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.Text;
-import org.jdom.input.SAXBuilder;
@@ -571,7 +535,7 @@
PropertyManager manager = PropertyManager.getInstance();
- PropertyDefinition definition = manager.getComputedProperty(
+ PropertyComputer definition = manager.getComputedProperty(
PropertyName.getPropertyName(propertyName));
if (this.webdavContext == null) {
1.5 +2 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UnlockListenerImpl.java
Index: UnlockListenerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UnlockListenerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UnlockListenerImpl.java 17 Sep 2004 16:19:17 -0000 1.4
+++ UnlockListenerImpl.java 21 Dec 2004 16:17:04 -0000 1.5
@@ -100,13 +100,12 @@
if( Configuration.useVersionControl() &&
(resourceKind instanceof CheckedOutVersionControlled) ) {
NodeProperty checkinLocktokenProperty =
-
revisionDescriptor.getProperty(DeltavConstants.I_CHECKIN_LOCKTOKEN,
-
NodeProperty.NamespaceCache.SLIDE_URI);
+
revisionDescriptor.getProperty(DeltavConstants.PN_CHECKIN_LOCKTOKEN);
if (checkinLocktokenProperty == null) {
// retry with default (DAV:) namespace which was the
// former namespace of this property
checkinLocktokenProperty =
-
revisionDescriptor.getProperty(DeltavConstants.I_CHECKIN_LOCKTOKEN);
+
revisionDescriptor.getProperty(DeltavConstants.PN_CHECKIN_LOCKTOKEN_COMP);
}
if ( (checkinLocktokenProperty != null) &&
(checkinLocktokenProperty.getValue() != null)
// &&
slideToken.checkLockToken(checkinLocktokenProperty.getValue().toString())
1.36 +18 -22
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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- UriHandler.java 15 Dec 2004 18:03:03 -0000 1.35
+++ UriHandler.java 21 Dec 2004 16:17:04 -0000 1.36
@@ -213,15 +213,15 @@
NodeRevisionDescriptors hpathNrds = content.retrieve(sToken,
hpath);
NodeRevisionDescriptor hpathNrd = content.retrieve(sToken,
hpathNrds);
- NodeProperty nextHnProp =
hpathNrd.getProperty(I_NEXT_HISTORY_NAME, NamespaceCache.SLIDE_URI);
+ NodeProperty nextHnProp =
hpathNrd.getProperty(PN_NEXT_HISTORY_NAME);
if (UriHandler.useHistoryCollectionHack) {
if (nextHnProp == null || nextHnProp.getValue() == null) {
// XXX start with historyCollectionHackChildren to
assure no
// resources are created directly in history folder
- nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME, "10",
- NamespaceCache.SLIDE_URI, true); // protected
+ nextHnProp = new NodeProperty(PN_NEXT_HISTORY_NAME,
"10",
+ true); // protected
hpathNrd.setProperty(nextHnProp);
}
@@ -264,8 +264,8 @@
result = UriHandler.getUriHandler(hpath + "/" +
buf.toString());
- nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME,
String.valueOf(nextHnLong + 1),
- NamespaceCache.SLIDE_URI);
+ nextHnProp = new NodeProperty(PN_NEXT_HISTORY_NAME,
+ String.valueOf(nextHnLong + 1));
hpathNrd.setProperty(nextHnProp);
} else {
@@ -273,19 +273,18 @@
if (nextHnProp == null) {
// convert to slide namespace if this property is still
// in DAV: namespace
- nextHnProp = hpathNrd.getProperty(I_NEXT_HISTORY_NAME);
+ nextHnProp =
hpathNrd.getProperty(PN_NEXT_HISTORY_NAME_COMP);
if (nextHnProp != null) {
hpathNrd.removeProperty(nextHnProp);
- nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME,
+ nextHnProp = new NodeProperty(PN_NEXT_HISTORY_NAME,
nextHnProp.getValue(),
- NamespaceCache.SLIDE_URI,
true); // protected
hpathNrd.setProperty(nextHnProp);
}
}
if (nextHnProp == null || nextHnProp.getValue() == null) {
- nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME,
- I_INITIAL_HISTORY_NAME, NamespaceCache.SLIDE_URI,
+ nextHnProp = new NodeProperty(PN_NEXT_HISTORY_NAME,
+ I_INITIAL_HISTORY_NAME,
true); // protected
hpathNrd.setProperty(nextHnProp);
}
@@ -294,8 +293,8 @@
result = UriHandler.getUriHandler(hpath + "/" + nextHnStr);
long nextHnLong = Long.parseLong(nextHnStr);
- nextHnProp = new NodeProperty(I_NEXT_HISTORY_NAME,
String.valueOf(nextHnLong + 1),
- NamespaceCache.SLIDE_URI);
+ nextHnProp = new NodeProperty(PN_NEXT_HISTORY_NAME,
+ String.valueOf(nextHnLong + 1));
hpathNrd.setProperty(nextHnProp);
}
@@ -336,17 +335,16 @@
NodeRevisionDescriptor wrpathNrd =
content.retrieve( sToken, wrpathNrds );
- NodeProperty nextWrnProp =
wrpathNrd.getProperty(I_NEXT_WORKINGRESOURCE_NAME,
-
NamespaceCache.SLIDE_URI);
+ NodeProperty nextWrnProp =
wrpathNrd.getProperty(PN_NEXT_WORKINGRESOURCE_NAME);
+
if (nextWrnProp == null) {
// convert to slide namespace if this property is still
// in DAV: namespace
- nextWrnProp = wrpathNrd.getProperty(
I_NEXT_WORKINGRESOURCE_NAME );
+ nextWrnProp =
wrpathNrd.getProperty(PN_NEXT_WORKINGRESOURCE_NAME_COMP);
if (nextWrnProp != null) {
wrpathNrd.removeProperty(nextWrnProp);
- nextWrnProp = new
NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
+ nextWrnProp = new
NodeProperty(PN_NEXT_WORKINGRESOURCE_NAME,
nextWrnProp.getValue(),
- NamespaceCache.SLIDE_URI,
true); // protected
wrpathNrd.setProperty( nextWrnProp );
}
@@ -354,9 +352,8 @@
if( nextWrnProp == null || nextWrnProp.getValue() == null ) {
nextWrnProp =
- new NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
+ new NodeProperty(PN_NEXT_WORKINGRESOURCE_NAME,
I_INITIAL_WORKINGRESOURCE_NAME,
- NamespaceCache.SLIDE_URI,
true); // protected
wrpathNrd.setProperty( nextWrnProp );
}
@@ -365,9 +362,8 @@
result = UriHandler.getUriHandler( wrpath+"/"+nextWrnStr );
long nextWrnLong = Long.parseLong( nextWrnStr );
- nextWrnProp = new NodeProperty(I_NEXT_WORKINGRESOURCE_NAME,
- String.valueOf(nextWrnLong + 1),
- NamespaceCache.SLIDE_URI );
+ nextWrnProp = new NodeProperty(PN_NEXT_WORKINGRESOURCE_NAME,
+ String.valueOf(nextWrnLong + 1));
wrpathNrd.setProperty( nextWrnProp );
content.store( sToken, wrpath, wrpathNrd, null );
//revisionContent = null
1.113 +68 -69
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.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- VersioningHelper.java 15 Dec 2004 18:03:03 -0000 1.112
+++ VersioningHelper.java 21 Dec 2004 16:17:04 -0000 1.113
@@ -24,6 +24,7 @@
package org.apache.slide.webdav.util;
import java.io.IOException;
import java.io.StringReader;
+import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -266,7 +267,7 @@
NodeProperty p = (NodeProperty)j.nextElement();
if( p.isLiveProperty() )
continue;
- if( !vrNrd.exists(p.getName()) )
+ if( !vrNrd.exists(p.getPropertyName()) )
vrNrd.setProperty( p );
}
@@ -276,17 +277,15 @@
vrNrd.setContentLength(rNrd.getContentLength()); //
P_GETCONTENTLENGTH
vrNrd.setContentLanguage(rNrd.getContentLanguage()); //
P_GETCONTENTLANGUAGE
String comment = "INITIAL VERSION. ";
- if( rNrd.exists(P_COMMENT) )
- comment += (String)rNrd.getProperty(P_COMMENT).getValue();
+ if( rNrd.exists(PN_COMMENT) )
+ comment += (String)rNrd.getProperty(PN_COMMENT).getValue();
vrNrd.setProperty(
- new NodeProperty(P_COMMENT, comment) );
+ new NodeProperty(PN_COMMENT, comment) );
// Set initial VHR properties
- Vector vhrLabels = new Vector();
- Hashtable vhrProps = new Hashtable();
- String vhrBranch = NodeRevisionDescriptors.MAIN_BRANCH;
NodeRevisionDescriptor vhrNrd =
- new NodeRevisionDescriptor( NodeRevisionNumber.HIDDEN_0_0,
vhrBranch, vhrLabels, vhrProps );
+ new NodeRevisionDescriptor( NodeRevisionNumber.HIDDEN_0_0,
+ NodeRevisionDescriptors.MAIN_BRANCH );
i = pHelp.createInitialProperties(VersionHistoryImpl.getInstance(),
vhrUri).iterator();
while( i.hasNext() )
vhrNrd.setProperty( (NodeProperty)i.next() );
@@ -295,7 +294,7 @@
i =
pHelp.createInitialProperties(VersionControlledImpl.getInstance(),
resourcePath).iterator();
while( i.hasNext() ) {
NodeProperty p = (NodeProperty)i.next();
- if( !rNrd.exists(p.getName()) )
+ if( !rNrd.exists(p.getPropertyName()) )
rNrd.setProperty( p );
}
@@ -319,7 +318,7 @@
// Set specific properties
vrNrd.setName(rUh.getName()); // P_DISPLAYNAME
rNrd.setProperty(
- new NodeProperty(P_CHECKED_IN, pHelp.createHrefValue(vrUri)) );
+ new NodeProperty(PN_CHECKED_IN, pHelp.createHrefValue(vrUri)) );
vhrNrd.setCreationDate( new Date() ); // P_CREATIONDATE
setCreationUser(vhrNrd);
vhrNrd.setLastModified( new Date() ); // P_GETLASTMODIFIED
@@ -328,13 +327,13 @@
// vhrNrd.setName( vhrUh.getHistoryName() ); // P_DISPLAYNAME
vhrNrd.setName( rNrd.getName() ); // P_DISPLAYNAME
vhrNrd.setProperty(
- new NodeProperty(P_VERSION_SET, pHelp.createHrefValue(vrUri)) );
+ new NodeProperty(PN_VERSION_SET, pHelp.createHrefValue(vrUri)) );
vrNrd.setCreationDate( new Date() ); // P_CREATIONDATE
setCreationUser(vrNrd);
vrNrd.setLastModified( new Date() ); // P_GETLASTMODIFIED
vrNrd.setETag( PropertyHelper.computeEtag(vrUri, vrNrd)); //
P_GETETAG
vrNrd.setProperty(
- new NodeProperty(P_VERSION_NAME, vrUh.getVersionName()) );
+ new NodeProperty(PN_VERSION_NAME, vrUh.getVersionName()) );
// Store changes
content.store( sToken, resourcePath, rNrd, null );
//revisionContent=null
@@ -415,7 +414,7 @@
}
vcrNrd.setCreationDate( new Date() ); // P_CREATIONDATE
setCreationUser(vcrNrd);
- vcrNrd.setProperty( new NodeProperty(P_CHECKED_IN,
+ vcrNrd.setProperty( new NodeProperty(PN_CHECKED_IN,
pHelp.createHrefValue(evUri)) );
// set workspace
setWorkspaceProperty( vcrUri, vcrNrd );
@@ -587,10 +586,10 @@
String wsUri = rUh.getAssociatedWorkspaceUri();
if( wsUri != null ) {
rNrd.setProperty(
- new NodeProperty(P_WORKSPACE, pHelp.createHrefValue(wsUri))
);
+ new NodeProperty(PN_WORKSPACE, pHelp.createHrefValue(wsUri))
);
}
else {
- rNrd.removeProperty(P_WORKSPACE);
+ rNrd.removeProperty(PN_WORKSPACE);
}
}
@@ -635,7 +634,7 @@
// Set specific properties
wsNrd.setProperty(
- new NodeProperty(P_WORKSPACE, pHelp.createHrefValue(wsUri)) );
+ new NodeProperty(PN_WORKSPACE, pHelp.createHrefValue(wsUri)) );
wsNrd.setLastModified( new Date() ); //P_GETLASTMODIFIED
wsNrd.setContentLength( 0 ); // P_GETCONTENTLENGTH
wsNrd.setETag( PropertyHelper.computeEtag(wsUri, wsNrd) ); //
P_GETETAG
@@ -748,7 +747,7 @@
if( rRk instanceof CheckedInVersionControlled ) {
// get checked-in VR
- NodeProperty cinProp = rNrd.getProperty( P_CHECKED_IN );
+ NodeProperty cinProp = rNrd.getProperty(PN_CHECKED_IN);
String cinHref = getElementValue((String)cinProp.getValue());
UriHandler cinUriHandler = UriHandler.getUriHandler(cinHref);
String cinhUri = cinUriHandler.getAssociatedHistoryUri();
@@ -773,14 +772,14 @@
backupSpecificLiveProperties(rNrds, rNrd);
rNrd.removeProperty( cinProp );
rNrd.setProperty(
- new NodeProperty(P_CHECKED_OUT, cinProp.getValue()) );
+ new NodeProperty(PN_CHECKED_OUT, cinProp.getValue()) );
rNrd.setProperty(
- new NodeProperty(P_PREDECESSOR_SET, cinProp.getValue()) );
- NodeProperty property = cinNrd.getProperty(P_CHECKOUT_FORK);
+ new NodeProperty(PN_PREDECESSOR_SET, cinProp.getValue()) );
+ NodeProperty property = cinNrd.getProperty(PN_CHECKOUT_FORK);
if (property != null) {
rNrd.setProperty(property);
}
- property = cinNrd.getProperty(P_CHECKIN_FORK);
+ property = cinNrd.getProperty(PN_CHECKIN_FORK);
if (property != null) {
rNrd.setProperty(property);
}
@@ -873,13 +872,13 @@
// set specific live props
wrNrd.setProperty(
- new NodeProperty(P_CHECKED_OUT, pHelp.createHrefValue(rUri))
);
+ new NodeProperty(PN_CHECKED_OUT,
pHelp.createHrefValue(rUri)) );
wrNrd.setProperty(
- new NodeProperty(P_PREDECESSOR_SET,
pHelp.createHrefValue(rUri)) );
- NodeProperty coutfProp = rNrd.getProperty(P_CHECKOUT_FORK);
+ new NodeProperty(PN_PREDECESSOR_SET,
pHelp.createHrefValue(rUri)) );
+ NodeProperty coutfProp = rNrd.getProperty(PN_CHECKOUT_FORK);
if( coutfProp != null )
wrNrd.setProperty( coutfProp );
- NodeProperty cinfProp = rNrd.getProperty(P_CHECKIN_FORK);
+ NodeProperty cinfProp = rNrd.getProperty(PN_CHECKIN_FORK);
if( cinfProp != null )
wrNrd.setProperty( cinfProp );
wrNrd.setContentType(rNrd.getContentType()); // P_GETCONTENTTYPE
@@ -894,11 +893,11 @@
if( autoUpdateUri != null && autoUpdateUri.length() > 0 ) {
UriHandler autoUpdateUh = UriHandler.getUriHandler(
autoUpdateUri );
wrNrd.setProperty(
- new NodeProperty(P_AUTO_UPDATE,
pHelp.createHrefValue(autoUpdateUri)) );
+ new NodeProperty(PN_AUTO_UPDATE,
pHelp.createHrefValue(autoUpdateUri)) );
wrNrd.setName( autoUpdateUh.getName() );
}
else {
- wrNrd.removeProperty( P_AUTO_UPDATE );
+ wrNrd.removeProperty(PN_AUTO_UPDATE);
wrNrd.setName( rNrd.getName() );
}
@@ -948,7 +947,7 @@
ViolatedPrecondition violatedPrecondition = null;
- NodeProperty checkoutForkProperty
=cinNrd.getProperty(P_CHECKOUT_FORK);
+ NodeProperty checkoutForkProperty
=cinNrd.getProperty(PN_CHECKOUT_FORK);
if (checkoutForkProperty != null
&& !checkoutForkProperty.getValue().toString().equals(""))
{
@@ -1032,7 +1031,7 @@
}
// get checked-out VR
- NodeProperty coutProp = rNrd.getProperty( P_CHECKED_OUT );
+ NodeProperty coutProp = rNrd.getProperty(PN_CHECKED_OUT);
String coutHref = getElementValue((String)coutProp.getValue());
UriHandler coutUriHandler = UriHandler.getUriHandler(coutHref);
String coutUri = coutUriHandler.getAssociatedHistoryUri();
@@ -1058,7 +1057,7 @@
content.store(sToken, coutNrds.getUri(), coutNrd, null);
// update VCR to previous VR
- rNrd.removeProperty( P_CHECKED_OUT );
+ rNrd.removeProperty(PN_CHECKED_OUT);
update( rNrds, rNrd, coutNrds, coutNrd );
// restore some live properties
@@ -1125,9 +1124,9 @@
boolean isWorkingResource = (rRk instanceof Working);
- NodeProperty coutProp = rNrd.getProperty( P_CHECKED_OUT );
- NodeProperty predSetProp = rNrd.getProperty( P_PREDECESSOR_SET );
- NodeProperty autoUpdProp = rNrd.getProperty( P_AUTO_UPDATE );
+ NodeProperty coutProp = rNrd.getProperty(PN_CHECKED_OUT);
+ NodeProperty predSetProp = rNrd.getProperty(PN_PREDECESSOR_SET);
+ NodeProperty autoUpdProp = rNrd.getProperty(PN_AUTO_UPDATE);
// prepare auto-update
NodeRevisionDescriptors autoUpdNrds = null;
@@ -1147,7 +1146,7 @@
String vhrUri = vrUhOld.getAssociatedHistoryUri();
NodeRevisionDescriptors vhrNrds = content.retrieve( sToken,
vhrUri );
NodeRevisionDescriptor vhrNrd = content.retrieve( sToken,
vhrNrds ); //vhrUri
- NodeProperty vSetProp = vhrNrd.getProperty( P_VERSION_SET );
+ NodeProperty vSetProp = vhrNrd.getProperty(PN_VERSION_SET);
// Retrieve old VR
NodeRevisionDescriptor vrNrdOld =
@@ -1202,7 +1201,7 @@
NodeProperty p = (NodeProperty)j.nextElement();
if( p.isLiveProperty() )
continue;
- if( !vrNrdNew.exists(p.getName()) )
+ if( !vrNrdNew.exists(p.getPropertyName()))
vrNrdNew.setProperty( p );
}
// Copy specific live properties VCR/WR -> VR
@@ -1210,13 +1209,13 @@
vrNrdNew.setContentLength(rNrd.getContentLength()); //
P_GETCONTENTLENGTH
vrNrdNew.setContentLanguage( rNrd.getContentLanguage() ); //
P_GETCONTENTLANGUAGE
String comment = (autoVersion ? "CREATED BY AUTO-VERSIONING. " :
"");
- if( rNrd.exists(P_COMMENT) )
- comment = (String)rNrd.getProperty(P_COMMENT).getValue();
+ if( rNrd.exists(PN_COMMENT) )
+ comment = (String)rNrd.getProperty(PN_COMMENT).getValue();
vrNrdNew.setProperty(
- new NodeProperty(P_COMMENT, comment) );
+ new NodeProperty(PN_COMMENT, comment) );
- vrNrdNew.setProperty( rNrd.getProperty(P_CHECKOUT_FORK) );
- vrNrdNew.setProperty( rNrd.getProperty(P_CHECKIN_FORK) );
+ vrNrdNew.setProperty( rNrd.getProperty(PN_CHECKOUT_FORK) );
+ vrNrdNew.setProperty( rNrd.getProperty(PN_CHECKIN_FORK) );
NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd
);
@@ -1237,9 +1236,9 @@
// set specific properties
if( keepCheckedOut ) {
rNrd.setProperty(
- new NodeProperty(P_CHECKED_OUT,
pHelp.createHrefValue(vrUriNew)) );
+ new NodeProperty(PN_CHECKED_OUT,
pHelp.createHrefValue(vrUriNew)) );
rNrd.setProperty(
- new NodeProperty(P_PREDECESSOR_SET, "") );
+ new NodeProperty(PN_PREDECESSOR_SET, "") );
PropertyHelper.addHrefToProperty(rNrd, P_PREDECESSOR_SET,
vrUriNew);
PropertyHelper.addHrefToProperty(vrNrdNew, P_CHECKOUT_SET,
rUri);
}
@@ -1247,29 +1246,29 @@
if( !isWorkingResource ) {
rNrd.removeProperty( coutProp );
rNrd.setProperty(
- new NodeProperty(P_CHECKED_IN,
pHelp.createHrefValue(vrUriNew)) );
- rNrd.removeProperty( I_CHECKIN_LOCKTOKEN ,
NamespaceCache.SLIDE_URI);
+ new NodeProperty(PN_CHECKED_IN,
pHelp.createHrefValue(vrUriNew)) );
+ rNrd.removeProperty(PN_CHECKIN_LOCKTOKEN);
// retry with default (DAV:) namespace which was the
// former namespace of this property
- rNrd.removeProperty( I_CHECKIN_LOCKTOKEN );
- rNrd.removeProperty(P_PREDECESSOR_SET);
- rNrd.removeProperty(P_CHECKOUT_FORK);
- rNrd.removeProperty(P_CHECKIN_FORK);
+ rNrd.removeProperty(PN_CHECKIN_LOCKTOKEN_COMP);
+ rNrd.removeProperty(PN_PREDECESSOR_SET);
+ rNrd.removeProperty(PN_CHECKOUT_FORK);
+ rNrd.removeProperty(PN_CHECKIN_FORK);
}
}
vhrNrd.setLastModified( new Date() ); // P_GETLASTMODIFIED
vhrNrd.setProperty( new NodeProperty(
- P_VERSION_SET,
((String)vSetProp.getValue())+pHelp.createHrefValue(vrUriNew)) );
+ PN_VERSION_SET,
((String)vSetProp.getValue())+pHelp.createHrefValue(vrUriNew)) );
vrNrdNew.setName( rNrd.getName() ); // P_DISPLAYNAME
vrNrdNew.setCreationDate( new Date() ); // P_CREATIONDATE
vrNrdNew.setLastModified( new Date() ); // P_GETLASTMODIFIED
vrNrdNew.setETag( PropertyHelper.computeEtag(vrUriNew, vrNrdNew)
); // P_GETETAG
vrNrdNew.setProperty(
- new NodeProperty(P_VERSION_NAME, vrUhNew.getVersionName()) );
+ new NodeProperty(PN_VERSION_NAME, vrUhNew.getVersionName())
);
vrNrdNew.setProperty(
- new NodeProperty(P_PREDECESSOR_SET, predSetProp.getValue())
);
+ new NodeProperty(PN_PREDECESSOR_SET, predSetProp.getValue())
);
// Store changes
if( keepCheckedOut || !isWorkingResource ) {
@@ -1359,7 +1358,7 @@
NodeRevisionDescriptor predecessorNrd =
content.retrieve(stok,
vhrNrds,
predecessorNrn);
- NodeProperty predecessorCheckinForkProperty =
predecessorNrd.getProperty(P_CHECKIN_FORK);
+ NodeProperty predecessorCheckinForkProperty =
predecessorNrd.getProperty(PN_CHECKIN_FORK);
if (predecessorCheckinForkProperty != null
&&
!predecessorCheckinForkProperty.getValue().toString().equals(""))
{
@@ -1383,7 +1382,7 @@
// check precondition C_NO_OVERWRITE_BY_AUTO_UPDATE
if( autoUpdNrd != null ) {
- NodeProperty cinProp = autoUpdNrd.getProperty(
P_CHECKED_IN );
+ NodeProperty cinProp =
autoUpdNrd.getProperty(PN_CHECKED_IN);
if( cinProp != null ) {
Element cinHrefElm = pHelp.parsePropertyValue(
(String)cinProp.getValue() );
UriHandler cinUh = UriHandler.getUriHandler(
cinHrefElm.getTextTrim() );
@@ -1435,7 +1434,7 @@
NodeRevisionDescriptor predecessorNrd =
content.retrieve(sToken,
vhrNrds,
predecessorNrn);
- NodeProperty predecessorCheckinForkProperty =
predecessorNrd.getProperty(P_CHECKIN_FORK);
+ NodeProperty predecessorCheckinForkProperty =
predecessorNrd.getProperty(PN_CHECKIN_FORK);
if (predecessorCheckinForkProperty != null) {
Enumeration predecessorSuccessors =
vhrNrds.getSuccessors(predecessorNrn);
@@ -1550,7 +1549,7 @@
// update specific live properties
String vrUri = getUri(vrRevisionDescriptors, vrRevisionDescriptor);
- vcrRevisionDescriptor.setProperty(new NodeProperty(P_CHECKED_IN,
+ vcrRevisionDescriptor.setProperty(new NodeProperty(PN_CHECKED_IN,
pHelp.createHrefValue(vrUri)) );
vcrRevisionDescriptor.setLastModified(new Date());
vcrRevisionDescriptor.setContentLength(vrRevisionDescriptor.getContentLength());
@@ -1583,23 +1582,23 @@
protected void backupSpecificLiveProperties(NodeRevisionDescriptors
rNrds, NodeRevisionDescriptor rNrd) throws SlideException {
NodeRevisionDescriptor backupNrd =
- new NodeRevisionDescriptor( NodeRevisionNumber.HIDDEN_0_0,
"backup", new Vector(), new Hashtable() );
+ new NodeRevisionDescriptor( NodeRevisionNumber.HIDDEN_0_0,
"backup");
NodeProperty p;
- p = rNrd.getProperty( P_AUTO_VERSION );
+ p = rNrd.getProperty( PN_AUTO_VERSION );
if( p != null )
backupNrd.setProperty( p );
- p = rNrd.getProperty( P_COMMENT );
+ p = rNrd.getProperty( PN_COMMENT );
if( p != null )
backupNrd.setProperty( p );
- p = rNrd.getProperty( P_DISPLAYNAME );
+ p = rNrd.getProperty( PN_DISPLAYNAME );
if( p != null )
backupNrd.setProperty( p );
- p = rNrd.getProperty( P_CREATOR_DISPLAYNAME );
+ p = rNrd.getProperty( PN_CREATOR_DISPLAYNAME );
if( p != null )
backupNrd.setProperty( p );
@@ -1630,19 +1629,19 @@
NodeProperty p;
- p = backupNrd.getProperty( P_AUTO_VERSION );
+ p = backupNrd.getProperty( PN_AUTO_VERSION );
if( p != null )
rNrd.setProperty( p );
- p = backupNrd.getProperty( P_COMMENT );
+ p = backupNrd.getProperty( PN_COMMENT );
if( p != null )
rNrd.setProperty( p );
- p = backupNrd.getProperty( P_DISPLAYNAME );
+ p = backupNrd.getProperty( PN_DISPLAYNAME );
if( p != null )
rNrd.setProperty( p );
- p = backupNrd.getProperty( P_CREATOR_DISPLAYNAME );
+ p = backupNrd.getProperty( PN_CREATOR_DISPLAYNAME );
if( p != null )
rNrd.setProperty( p );
@@ -1664,7 +1663,7 @@
public String getAutoVersionElementName(NodeRevisionDescriptor
revisionDescriptor) {
String autoVersionValue = null;
- NodeProperty autoVersionProperty =
revisionDescriptor.getProperty(DeltavConstants.P_AUTO_VERSION);
+ NodeProperty autoVersionProperty =
revisionDescriptor.getProperty(DeltavConstants.PN_AUTO_VERSION);
if ( (autoVersionProperty != null) &&
(autoVersionProperty.getValue() != null) ) {
if (autoVersionProperty.getValue().toString().length() > 0) {
autoVersionValue =
getElementName(autoVersionProperty.getValue().toString());
@@ -1951,7 +1950,7 @@
NodeRevisionDescriptors historyNrds = content.retrieve(sToken,
historyUri);
NodeRevisionDescriptor historyNrd =
content.retrieve(sToken, historyNrds,
NodeRevisionNumber.HIDDEN_0_0);
- NodeProperty versionSet = historyNrd.getProperty(P_VERSION_SET);
+ NodeProperty versionSet = historyNrd.getProperty(PN_VERSION_SET);
try {
XMLValue versionSetValue = new
XMLValue(versionSet.getValue().toString());
NodeRevisionDescriptor vrNrd = null;
@@ -1966,7 +1965,7 @@
vrUriHandler = UriHandler.getUriHandler(vrUri);
NodeRevisionNumber vrRevisionNumber = new
NodeRevisionNumber(vrUriHandler.getVersionName());
vrNrd = content.retrieve(sToken, historyNrds,
vrRevisionNumber);
- labelNameSetProperty =
vrNrd.getProperty(P_LABEL_NAME_SET);
+ labelNameSetProperty =
vrNrd.getProperty(PN_LABEL_NAME_SET);
if ( (labelNameSetProperty != null) &&
(labelNameSetProperty.getValue() != null) ) {
labelNameSetString =
labelNameSetProperty.getValue().toString();
if (labelNameSetString != null) {
@@ -2017,9 +2016,9 @@
if (!revisionDescriptors.isVersioned()) {
NodeRevisionDescriptor revisionDescriptor =
content.retrieve( sToken, revisionDescriptors);
- NodeProperty property =
revisionDescriptor.getProperty(P_CHECKED_OUT);
+ NodeProperty property =
revisionDescriptor.getProperty(PN_CHECKED_OUT);
if ( (property == null) || (property.getValue() == null) ) {
- property = revisionDescriptor.getProperty(P_CHECKED_IN);
+ property = revisionDescriptor.getProperty(PN_CHECKED_IN);
}
if ( (property != null) && (property.getValue() != null) ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
