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 2016/12/12 12:03:43 UTC

svn commit: r1773777 [2/2] - in /jackrabbit/branches/2.12: ./ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav...

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java Mon Dec 12 12:03:43 2016
@@ -16,30 +16,26 @@
  */
 package org.apache.jackrabbit.webdav.client.methods;
 
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.commons.httpclient.HttpConnection;
+import org.apache.commons.httpclient.HttpState;
 import org.apache.jackrabbit.webdav.DavConstants;
+import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.DavMethods;
-import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
-import org.apache.jackrabbit.webdav.property.DavPropertySet;
-import org.apache.jackrabbit.webdav.property.DavPropertyName;
-import org.apache.jackrabbit.webdav.property.DavPropertyNameIterator;
-import org.apache.jackrabbit.webdav.property.DavProperty;
-import org.apache.jackrabbit.webdav.property.PropEntry;
 import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.MultiStatusResponse;
-import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.Status;
-import org.apache.jackrabbit.webdav.xml.DomUtil;
-import org.apache.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.HttpConnection;
+import org.apache.jackrabbit.webdav.property.DavPropertyName;
+import org.apache.jackrabbit.webdav.property.DavPropertyNameIterator;
+import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
+import org.apache.jackrabbit.webdav.property.DavPropertySet;
+import org.apache.jackrabbit.webdav.property.PropEntry;
+import org.apache.jackrabbit.webdav.property.ProppatchInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.util.List;
 
 /**
  * <code>PropPatchMethod</code>...
@@ -48,9 +44,8 @@ public class PropPatchMethod extends Dav
 
     private static Logger log = LoggerFactory.getLogger(PropPatchMethod.class);
 
-    private final DavPropertyNameSet propertyNames = new DavPropertyNameSet();
-
     private DavException responseException;
+    private DavPropertyNameSet propertyNames;
 
     /**
      *
@@ -61,81 +56,17 @@ public class PropPatchMethod extends Dav
      */
     public PropPatchMethod(String uri, List<? extends PropEntry> changeList) throws IOException {
         super(uri);
-        if (changeList == null || changeList.isEmpty()) {
-            throw new IllegalArgumentException("PROPPATCH cannot be executed without properties to be set or removed.");
-        }
-        try {
-            Document document = DomUtil.createDocument();
-            Element propUpdateElement = DomUtil.addChildElement(document, XML_PROPERTYUPDATE, NAMESPACE);
-
-            Element propElement = null;
-            boolean isSet = false;
-            for (Object entry : changeList) {
-                if (entry instanceof DavPropertyName) {
-                    // DAV:remove
-                    DavPropertyName removeName = (DavPropertyName) entry;
-                    if (propElement == null || isSet) {
-                        isSet = false;
-                        propElement = getPropElement(propUpdateElement, isSet);
-                    }
-                    propElement.appendChild(removeName.toXml(document));
-                    propertyNames.add(removeName);
-                } else if (entry instanceof DavProperty) {
-                    // DAV:set
-                    DavProperty<?> setProperty = (DavProperty<?>) entry;
-                    if (propElement == null || !isSet) {
-                        isSet = true;
-                        propElement = getPropElement(propUpdateElement, isSet);
-                    }
-                    propElement.appendChild(setProperty.toXml(document));
-                    propertyNames.add(setProperty.getName());
-                } else {
-                    throw new IllegalArgumentException("ChangeList may only contain DavPropertyName and DavProperty elements.");
-                }
-            }
-            setRequestBody(document);
-        } catch (ParserConfigurationException e) {
-            throw new IOException(e.getMessage());
-        }
+        ProppatchInfo info = new ProppatchInfo(changeList);
+        setRequestBody(info);
+        this.propertyNames = info.getAffectedProperties();
     }
 
     public PropPatchMethod(String uri, DavPropertySet setProperties,
                            DavPropertyNameSet removeProperties) throws IOException {
         super(uri);
-        if (setProperties == null || removeProperties == null) {
-            throw new IllegalArgumentException("Neither setProperties nor removeProperties must be null.");
-        }
-        if (setProperties.isEmpty() && removeProperties.isEmpty()) {
-            throw new IllegalArgumentException("Either setProperties or removeProperties can be empty; not both of them.");
-        }
-
-        propertyNames.addAll(removeProperties);
-        for (DavPropertyName setName : setProperties.getPropertyNames()) {
-            propertyNames.add(setName);
-        }
-
-        try {
-            Document document = DomUtil.createDocument();
-            Element propupdate = DomUtil.addChildElement(document, XML_PROPERTYUPDATE, NAMESPACE);
-            // DAV:set
-            if (!setProperties.isEmpty()) {
-                Element set = DomUtil.addChildElement(propupdate, XML_SET, NAMESPACE);
-                set.appendChild(setProperties.toXml(document));
-            }
-            // DAV:remove
-            if (!removeProperties.isEmpty()) {
-                Element remove = DomUtil.addChildElement(propupdate, XML_REMOVE, NAMESPACE);
-                remove.appendChild(removeProperties.toXml(document));
-            }
-            setRequestBody(document);
-        } catch (ParserConfigurationException e) {
-            throw new IOException(e.getMessage());
-        }
-    }
-
-    private Element getPropElement(Element propUpdate, boolean isSet) {
-        Element updateEntry = DomUtil.addChildElement(propUpdate, (isSet) ? XML_SET : XML_REMOVE , NAMESPACE);
-        return DomUtil.addChildElement(updateEntry, XML_PROP, NAMESPACE);
+        ProppatchInfo info = new ProppatchInfo(setProperties, removeProperties);
+        setRequestBody(info);
+        this.propertyNames = info.getAffectedProperties();
     }
 
     //---------------------------------------------------------< HttpMethod >---

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java Mon Dec 12 12:03:43 2016
@@ -16,18 +16,14 @@
  */
 package org.apache.jackrabbit.webdav.client.methods;
 
-import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.DavMethods;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.jackrabbit.webdav.DavServletResponse;
 
 /**
  * <code>PutMethod</code>...
  */
 public class PutMethod extends DavMethodBase {
 
-    private static Logger log = LoggerFactory.getLogger(PutMethod.class);
-
     public PutMethod(String uri) {
         super(uri);
     }

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java Mon Dec 12 12:03:43 2016
@@ -16,23 +16,19 @@
  */
 package org.apache.jackrabbit.webdav.client.methods;
 
+import java.io.IOException;
+
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.DavMethods;
+import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.header.DepthHeader;
 import org.apache.jackrabbit.webdav.version.report.ReportInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.webdav.DavServletResponse;
-
-import java.io.IOException;
 
 /**
  * <code>ReportMethod</code>...
  */
 public class ReportMethod extends DavMethodBase {
 
-    private static Logger log = LoggerFactory.getLogger(ReportMethod.class);
-
     private final boolean isDeep;
 
     public ReportMethod(String uri, ReportInfo reportInfo) throws IOException {

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java Mon Dec 12 12:03:43 2016
@@ -16,22 +16,18 @@
  */
 package org.apache.jackrabbit.webdav.client.methods;
 
+import java.io.IOException;
+
 import org.apache.jackrabbit.webdav.DavMethods;
-import org.apache.jackrabbit.webdav.search.SearchInfo;
 import org.apache.jackrabbit.webdav.DavServletResponse;
+import org.apache.jackrabbit.webdav.search.SearchInfo;
 import org.apache.jackrabbit.webdav.xml.Namespace;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
 
 /**
  * <code>SearchMethod</code>...
  */
 public class SearchMethod extends DavMethodBase {
 
-    private static Logger log = LoggerFactory.getLogger(SearchMethod.class);
-
     public SearchMethod(String uri, String statement, String language) throws IOException {
         this(uri, statement, language, Namespace.EMPTY_NAMESPACE);
     }

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java Mon Dec 12 12:03:43 2016
@@ -16,22 +16,18 @@
  */
 package org.apache.jackrabbit.webdav.client.methods;
 
+import org.apache.commons.httpclient.HttpMethod;
 import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.DavMethods;
 import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.header.CodedUrlHeader;
 import org.apache.jackrabbit.webdav.header.Header;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.commons.httpclient.HttpMethod;
 
 /**
  * <code>UnLockMethod</code>...
  */
 public class UnLockMethod extends DavMethodBase {
 
-    private static Logger log = LoggerFactory.getLogger(UnLockMethod.class);
-
     public UnLockMethod(String uri, String lockToken) {
         super(uri);
         Header lth = new CodedUrlHeader(DavConstants.HEADER_LOCK_TOKEN, lockToken);

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java Mon Dec 12 12:03:43 2016
@@ -15,8 +15,6 @@
 */
 package org.apache.jackrabbit.webdav.client.methods;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.jackrabbit.webdav.DavMethods;
 import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.observation.ObservationConstants;
@@ -26,8 +24,6 @@ import org.apache.jackrabbit.webdav.obse
  */
 public class UnSubscribeMethod extends DavMethodBase {
 
-    private static Logger log = LoggerFactory.getLogger(UnSubscribeMethod.class);
-
     public UnSubscribeMethod(String uri, String subscriptionId) {
         super(uri);
         setRequestHeader(ObservationConstants.HEADER_SUBSCRIPTIONID, subscriptionId);

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java Mon Dec 12 12:03:43 2016
@@ -16,18 +16,14 @@
  */
 package org.apache.jackrabbit.webdav.client.methods;
 
-import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.DavMethods;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.jackrabbit.webdav.DavServletResponse;
 
 /**
  * <code>UncheckoutMethod</code>...
  */
 public class UncheckoutMethod extends DavMethodBase {
 
-    private static Logger log = LoggerFactory.getLogger(UncheckoutMethod.class);
-
     public UncheckoutMethod(String uri) {
         super(uri);
     }

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java Mon Dec 12 12:03:43 2016
@@ -16,21 +16,17 @@
  */
 package org.apache.jackrabbit.webdav.client.methods;
 
+import java.io.IOException;
+
 import org.apache.jackrabbit.webdav.DavMethods;
 import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.version.UpdateInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
 
 /**
  * <code>UpdateMethod</code>...
  */
 public class UpdateMethod extends DavMethodBase {
 
-    private static Logger log = LoggerFactory.getLogger(UpdateMethod.class);
-
     public UpdateMethod(String uri, UpdateInfo updateInfo) throws IOException {
         super(uri);
         setRequestBody(updateInfo);

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java Mon Dec 12 12:03:43 2016
@@ -18,16 +18,12 @@ package org.apache.jackrabbit.webdav.cli
 
 import org.apache.jackrabbit.webdav.DavMethods;
 import org.apache.jackrabbit.webdav.DavServletResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * <code>VersionControlMethod</code>...
  */
 public class VersionControlMethod extends DavMethodBase {
 
-    private static Logger log = LoggerFactory.getLogger(VersionControlMethod.class);
-
     public VersionControlMethod(String uri) {
         super(uri);
     }

Modified: jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/EventDiscovery.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/EventDiscovery.java?rev=1773777&r1=1773776&r2=1773777&view=diff
==============================================================================
--- jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/EventDiscovery.java (original)
+++ jackrabbit/branches/2.12/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/EventDiscovery.java Mon Dec 12 12:03:43 2016
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.webdav.observation;
 
 import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.ElementIterator;
 import org.apache.jackrabbit.webdav.xml.XmlSerializable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,4 +90,32 @@ public class EventDiscovery implements O
         }
         return ed;
     }
+
+    /**
+     * Build a <code>EventDiscovery</code> from the specified xml element.
+     *
+     * @param eventDiscoveryElement
+     * @return new <code>EventDiscovery</code> instance.
+     * @throws IllegalArgumentException if the given document is <code>null</code>
+     * or does not provide the required element.
+     */
+    public static EventDiscovery createFromXml(Element eventDiscoveryElement) {
+        if (!DomUtil.matches(eventDiscoveryElement, XML_EVENTDISCOVERY, ObservationConstants.NAMESPACE)) {
+            throw new IllegalArgumentException(
+                    "{" + ObservationConstants.NAMESPACE + "}" + XML_EVENTDISCOVERY + " element expected, but got: {"
+                            + eventDiscoveryElement.getNamespaceURI() + "}" + eventDiscoveryElement.getLocalName());
+        }
+        EventDiscovery eventDiscovery = new EventDiscovery();
+        ElementIterator it = DomUtil.getChildren(eventDiscoveryElement, XML_EVENTBUNDLE, ObservationConstants.NAMESPACE);
+        while (it.hasNext()) {
+            final Element ebElement = it.nextElement();
+            EventBundle eb = new EventBundle() {
+                public Element toXml(Document document) {
+                    return (Element) document.importNode(ebElement, true);
+                }
+            };
+            eventDiscovery.addEventBundle(eb);
+        }
+        return eventDiscovery;
+    }
 }