You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2012/06/04 19:47:27 UTC
svn commit: r1346052 - in /jackrabbit/branches/2.4: ./
jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/VersionControlledResourceImpl.java
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DefaultDavProperty.java
Author: reschke
Date: Mon Jun 4 17:47:27 2012
New Revision: 1346052
URL: http://svn.apache.org/viewvc?rev=1346052&view=rev
Log:
JCR-3329: hide DAV:auto-version and DAV:predecessor-set from PROPFIND/allprop requests (ported to 2.4)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/VersionControlledResourceImpl.java
jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DefaultDavProperty.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1346045
Modified: jackrabbit/branches/2.4/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/VersionControlledResourceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/VersionControlledResourceImpl.java?rev=1346052&r1=1346051&r2=1346052&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/VersionControlledResourceImpl.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/VersionControlledResourceImpl.java Mon Jun 4 17:47:27 2012
@@ -330,7 +330,7 @@ public class VersionControlledResourceIm
properties.add(new HrefProperty(VERSION_HISTORY, vhHref, true));
// DAV:auto-version property: there is no auto version, explicit CHECKOUT is required.
- properties.add(new DefaultDavProperty(AUTO_VERSION, null, false));
+ properties.add(new DefaultDavProperty(AUTO_VERSION, null, true));
// baseVersion -> used for DAV:checked-out or DAV:checked-in
String baseVHref = getLocatorFromNode(n.getBaseVersion()).getHref(false);
@@ -342,7 +342,7 @@ public class VersionControlledResourceIm
for (int i = 0; i < pv.length; i++) {
predecessors[i] = n.getSession().getNodeByIdentifier(pv[i].getString());
}
- properties.add(getHrefProperty(VersionResource.PREDECESSOR_SET, predecessors, false, false));
+ properties.add(getHrefProperty(VersionResource.PREDECESSOR_SET, predecessors, true, false));
}
// DAV:checked-out property (protected)
properties.add(new HrefProperty(CHECKED_OUT, baseVHref, true));
Modified: jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DefaultDavProperty.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DefaultDavProperty.java?rev=1346052&r1=1346051&r2=1346052&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DefaultDavProperty.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DefaultDavProperty.java Mon Jun 4 17:47:27 2012
@@ -45,12 +45,12 @@ public class DefaultDavProperty<T> exten
* @param name the name of the property
* @param value the value of the property
* @param namespace the namespace of the property
- * @param isProtected A value of true, defines this property to be protected.
+ * @param isInvisibleInAllprop A value of true, defines this property to be protected.
* It will not be returned in a {@link org.apache.jackrabbit.webdav.DavConstants#PROPFIND_ALL_PROP DAV:allprop}
* PROPFIND request and cannot be set/removed with a PROPPATCH request.
*/
- public DefaultDavProperty(String name, T value, Namespace namespace, boolean isProtected) {
- super(DavPropertyName.create(name, namespace), isProtected);
+ public DefaultDavProperty(String name, T value, Namespace namespace, boolean isInvisibleInAllprop) {
+ super(DavPropertyName.create(name, namespace), isInvisibleInAllprop);
this.value = value;
}
@@ -73,12 +73,12 @@ public class DefaultDavProperty<T> exten
*
* @param name the name of the property
* @param value the value of the property
- * @param isProtected A value of true, defines this property to be protected.
+ * @param isInvisibleInAllprop A value of true, defines this property to be protected.
* It will not be returned in a {@link org.apache.jackrabbit.webdav.DavConstants#PROPFIND_ALL_PROP DAV:allprop}
* PROPFIND request and cannot be set/removed with a PROPPATCH request.
*/
- public DefaultDavProperty(DavPropertyName name, T value, boolean isProtected) {
- super(name, isProtected);
+ public DefaultDavProperty(DavPropertyName name, T value, boolean isInvisibleInAllprop) {
+ super(name, isInvisibleInAllprop);
this.value = value;
}