You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2014/11/21 11:22:39 UTC

svn commit: r1640892 [3/3] - in /jackrabbit/trunk: jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/ jackrabbit-jcr-server/src/main/java/org/apache/jackrab...

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/SupportedPrivilegeSetProperty.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/SupportedPrivilegeSetProperty.java?rev=1640892&r1=1640891&r2=1640892&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/SupportedPrivilegeSetProperty.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/SupportedPrivilegeSetProperty.java Fri Nov 21 10:22:38 2014
@@ -16,9 +16,15 @@
  */
 package org.apache.jackrabbit.webdav.security;
 
+import org.apache.jackrabbit.webdav.DavException;
+import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.property.AbstractDavProperty;
+import org.apache.jackrabbit.webdav.property.DavProperty;
+import org.w3c.dom.Element;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Collections;
 
@@ -52,6 +58,28 @@ public class SupportedPrivilegeSetProper
         this.supportedPrivileges = supportedPrivileges;
     }
 
+    public SupportedPrivilegeSetProperty(DavProperty<?> p) throws DavException {
+        super(SecurityConstants.SUPPORTED_PRIVILEGE_SET, true);
+        if (!SecurityConstants.SUPPORTED_PRIVILEGE_SET.equals(getName())) {
+            throw new DavException(DavServletResponse.SC_BAD_REQUEST, "DAV:supported-privilege-set expected.");
+        }
+
+        List<SupportedPrivilege> supportedPrivs = new ArrayList<SupportedPrivilege>();
+        
+        for (Object obj : Collections.singletonList(p.getValue())) {
+            if (p instanceof Element) {
+                supportedPrivs.add(SupportedPrivilege.getSupportedPrivilege((Element) p));
+            } else if (obj instanceof Collection) {
+                for (Object entry : ((Collection<?>) obj)) {
+                    if (entry instanceof Element) {
+                        supportedPrivs.add(SupportedPrivilege.getSupportedPrivilege((Element) entry));
+                    }
+                }
+            }
+        }
+        supportedPrivileges = supportedPrivs.toArray(new SupportedPrivilege[supportedPrivs.size()]);
+    }
+
     /**
      * @return List of {@link SupportedPrivilege}s.
      */