Merged V2.1-A to HEAD

7686: Added authority management methods to AccessControl web service and associated unit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/generated/org/alfresco/repo/webservice/accesscontrol/AccessControlServiceSoapPort.java

@@ -54,4 +54,44 @@ public interface AccessControlServiceSoapPort extends java.rmi.Remote {
      * Sets the current node owner.
      */
     public org.alfresco.repo.webservice.accesscontrol.OwnerResult[] setOwners(org.alfresco.repo.webservice.types.Predicate predicate, java.lang.String owner) throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
+
+    /**
+     * Getsl aa the authorities avaialble in the repository.
+     */
+    public java.lang.String[] getAllAuthorities(org.alfresco.repo.webservice.accesscontrol.AuthorityFilter filter) throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
+
+    /**
+     * Ges the authorities for the current user
+     */
+    public java.lang.String[] getAuthorities() throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
+
+    /**
+     * Creates new authorities
+     */
+    public java.lang.String[] createAuthorities(java.lang.String parentAuthority, org.alfresco.repo.webservice.accesscontrol.NewAuthority[] newAuthorites) throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
+
+    /**
+     * Delete authorities
+     */
+    public void deleteAuthorities(java.lang.String[] authorities) throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
+
+    /**
+     * Adds child authorities to a specified parent authority
+     */
+    public java.lang.String[] addChildAuthorities(java.lang.String parentAuthority, java.lang.String[] authorities) throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
+
+    /**
+     * Remove child authorities from the specified parent authority
+     */
+    public void removeChildAuthorities(java.lang.String parentAuthority, java.lang.String[] authorities) throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
+
+    /**
+     * Gets an authorities child authorities
+     */
+    public java.lang.String[] getChildAuthorities(java.lang.String authority, org.alfresco.repo.webservice.accesscontrol.SiblingAuthorityFilter filter) throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
+
+    /**
+     * Gets an authorities parent authorities
+     */
+    public java.lang.String[] getParentAuthorities(java.lang.String authority, org.alfresco.repo.webservice.accesscontrol.SiblingAuthorityFilter filter) throws java.rmi.RemoteException, org.alfresco.repo.webservice.accesscontrol.AccessControlFault;
 }

source/generated/org/alfresco/repo/webservice/accesscontrol/AuthorityFilter.java

@@ -0,0 +1,151 @@
+/**
+ * AuthorityFilter.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package org.alfresco.repo.webservice.accesscontrol;
+
+public class AuthorityFilter  implements java.io.Serializable {
+    private java.lang.String authorityType;
+
+    private boolean rootOnly;
+
+    public AuthorityFilter() {
+    }
+
+    public AuthorityFilter(
+           java.lang.String authorityType,
+           boolean rootOnly) {
+           this.authorityType = authorityType;
+           this.rootOnly = rootOnly;
+    }
+
+
+    /**
+     * Gets the authorityType value for this AuthorityFilter.
+     * 
+     * @return authorityType
+     */
+    public java.lang.String getAuthorityType() {
+        return authorityType;
+    }
+
+
+    /**
+     * Sets the authorityType value for this AuthorityFilter.
+     * 
+     * @param authorityType
+     */
+    public void setAuthorityType(java.lang.String authorityType) {
+        this.authorityType = authorityType;
+    }
+
+
+    /**
+     * Gets the rootOnly value for this AuthorityFilter.
+     * 
+     * @return rootOnly
+     */
+    public boolean isRootOnly() {
+        return rootOnly;
+    }
+
+
+    /**
+     * Sets the rootOnly value for this AuthorityFilter.
+     * 
+     * @param rootOnly
+     */
+    public void setRootOnly(boolean rootOnly) {
+        this.rootOnly = rootOnly;
+    }
+
+    private java.lang.Object __equalsCalc = null;
+    public synchronized boolean equals(java.lang.Object obj) {
+        if (!(obj instanceof AuthorityFilter)) return false;
+        AuthorityFilter other = (AuthorityFilter) obj;
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+        __equalsCalc = obj;
+        boolean _equals;
+        _equals = true && 
+            ((this.authorityType==null && other.getAuthorityType()==null) || 
+             (this.authorityType!=null &&
+              this.authorityType.equals(other.getAuthorityType()))) &&
+            this.rootOnly == other.isRootOnly();
+        __equalsCalc = null;
+        return _equals;
+    }
+
+    private boolean __hashCodeCalc = false;
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+        __hashCodeCalc = true;
+        int _hashCode = 1;
+        if (getAuthorityType() != null) {
+            _hashCode += getAuthorityType().hashCode();
+        }
+        _hashCode += (isRootOnly() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        __hashCodeCalc = false;
+        return _hashCode;
+    }
+
+    // Type metadata
+    private static org.apache.axis.description.TypeDesc typeDesc =
+        new org.apache.axis.description.TypeDesc(AuthorityFilter.class, true);
+
+    static {
+        typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "AuthorityFilter"));
+        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("authorityType");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "authorityType"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("rootOnly");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "rootOnly"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+    }
+
+    /**
+     * Return type metadata object
+     */
+    public static org.apache.axis.description.TypeDesc getTypeDesc() {
+        return typeDesc;
+    }
+
+    /**
+     * Get Custom Serializer
+     */
+    public static org.apache.axis.encoding.Serializer getSerializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanSerializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+    /**
+     * Get Custom Deserializer
+     */
+    public static org.apache.axis.encoding.Deserializer getDeserializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanDeserializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+}

source/generated/org/alfresco/repo/webservice/accesscontrol/NewAuthority.java

@@ -0,0 +1,155 @@
+/**
+ * NewAuthority.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package org.alfresco.repo.webservice.accesscontrol;
+
+public class NewAuthority  implements java.io.Serializable {
+    private java.lang.String authorityType;
+
+    private java.lang.String name;
+
+    public NewAuthority() {
+    }
+
+    public NewAuthority(
+           java.lang.String authorityType,
+           java.lang.String name) {
+           this.authorityType = authorityType;
+           this.name = name;
+    }
+
+
+    /**
+     * Gets the authorityType value for this NewAuthority.
+     * 
+     * @return authorityType
+     */
+    public java.lang.String getAuthorityType() {
+        return authorityType;
+    }
+
+
+    /**
+     * Sets the authorityType value for this NewAuthority.
+     * 
+     * @param authorityType
+     */
+    public void setAuthorityType(java.lang.String authorityType) {
+        this.authorityType = authorityType;
+    }
+
+
+    /**
+     * Gets the name value for this NewAuthority.
+     * 
+     * @return name
+     */
+    public java.lang.String getName() {
+        return name;
+    }
+
+
+    /**
+     * Sets the name value for this NewAuthority.
+     * 
+     * @param name
+     */
+    public void setName(java.lang.String name) {
+        this.name = name;
+    }
+
+    private java.lang.Object __equalsCalc = null;
+    public synchronized boolean equals(java.lang.Object obj) {
+        if (!(obj instanceof NewAuthority)) return false;
+        NewAuthority other = (NewAuthority) obj;
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+        __equalsCalc = obj;
+        boolean _equals;
+        _equals = true && 
+            ((this.authorityType==null && other.getAuthorityType()==null) || 
+             (this.authorityType!=null &&
+              this.authorityType.equals(other.getAuthorityType()))) &&
+            ((this.name==null && other.getName()==null) || 
+             (this.name!=null &&
+              this.name.equals(other.getName())));
+        __equalsCalc = null;
+        return _equals;
+    }
+
+    private boolean __hashCodeCalc = false;
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+        __hashCodeCalc = true;
+        int _hashCode = 1;
+        if (getAuthorityType() != null) {
+            _hashCode += getAuthorityType().hashCode();
+        }
+        if (getName() != null) {
+            _hashCode += getName().hashCode();
+        }
+        __hashCodeCalc = false;
+        return _hashCode;
+    }
+
+    // Type metadata
+    private static org.apache.axis.description.TypeDesc typeDesc =
+        new org.apache.axis.description.TypeDesc(NewAuthority.class, true);
+
+    static {
+        typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "NewAuthority"));
+        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("authorityType");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "authorityType"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("name");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "name"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+    }
+
+    /**
+     * Return type metadata object
+     */
+    public static org.apache.axis.description.TypeDesc getTypeDesc() {
+        return typeDesc;
+    }
+
+    /**
+     * Get Custom Serializer
+     */
+    public static org.apache.axis.encoding.Serializer getSerializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanSerializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+    /**
+     * Get Custom Deserializer
+     */
+    public static org.apache.axis.encoding.Deserializer getDeserializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanDeserializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+}

source/generated/org/alfresco/repo/webservice/accesscontrol/SiblingAuthorityFilter.java

@@ -0,0 +1,151 @@
+/**
+ * SiblingAuthorityFilter.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package org.alfresco.repo.webservice.accesscontrol;
+
+public class SiblingAuthorityFilter  implements java.io.Serializable {
+    private java.lang.String authorityType;
+
+    private boolean immediate;
+
+    public SiblingAuthorityFilter() {
+    }
+
+    public SiblingAuthorityFilter(
+           java.lang.String authorityType,
+           boolean immediate) {
+           this.authorityType = authorityType;
+           this.immediate = immediate;
+    }
+
+
+    /**
+     * Gets the authorityType value for this SiblingAuthorityFilter.
+     * 
+     * @return authorityType
+     */
+    public java.lang.String getAuthorityType() {
+        return authorityType;
+    }
+
+
+    /**
+     * Sets the authorityType value for this SiblingAuthorityFilter.
+     * 
+     * @param authorityType
+     */
+    public void setAuthorityType(java.lang.String authorityType) {
+        this.authorityType = authorityType;
+    }
+
+
+    /**
+     * Gets the immediate value for this SiblingAuthorityFilter.
+     * 
+     * @return immediate
+     */
+    public boolean isImmediate() {
+        return immediate;
+    }
+
+
+    /**
+     * Sets the immediate value for this SiblingAuthorityFilter.
+     * 
+     * @param immediate
+     */
+    public void setImmediate(boolean immediate) {
+        this.immediate = immediate;
+    }
+
+    private java.lang.Object __equalsCalc = null;
+    public synchronized boolean equals(java.lang.Object obj) {
+        if (!(obj instanceof SiblingAuthorityFilter)) return false;
+        SiblingAuthorityFilter other = (SiblingAuthorityFilter) obj;
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+        __equalsCalc = obj;
+        boolean _equals;
+        _equals = true && 
+            ((this.authorityType==null && other.getAuthorityType()==null) || 
+             (this.authorityType!=null &&
+              this.authorityType.equals(other.getAuthorityType()))) &&
+            this.immediate == other.isImmediate();
+        __equalsCalc = null;
+        return _equals;
+    }
+
+    private boolean __hashCodeCalc = false;
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+        __hashCodeCalc = true;
+        int _hashCode = 1;
+        if (getAuthorityType() != null) {
+            _hashCode += getAuthorityType().hashCode();
+        }
+        _hashCode += (isImmediate() ? Boolean.TRUE : Boolean.FALSE).hashCode();
+        __hashCodeCalc = false;
+        return _hashCode;
+    }
+
+    // Type metadata
+    private static org.apache.axis.description.TypeDesc typeDesc =
+        new org.apache.axis.description.TypeDesc(SiblingAuthorityFilter.class, true);
+
+    static {
+        typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "SiblingAuthorityFilter"));
+        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("authorityType");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "authorityType"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("immediate");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/accesscontrol/1.0", "immediate"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+    }
+
+    /**
+     * Return type metadata object
+     */
+    public static org.apache.axis.description.TypeDesc getTypeDesc() {
+        return typeDesc;
+    }
+
+    /**
+     * Get Custom Serializer
+     */
+    public static org.apache.axis.encoding.Serializer getSerializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanSerializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+    /**
+     * Get Custom Deserializer
+     */
+    public static org.apache.axis.encoding.Deserializer getDeserializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanDeserializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+}

source/generated/org/alfresco/repo/webservice/accesscontrol/deploy.wsdd

@@ -62,7 +62,43 @@
         <parameter qname="pns:owner" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
       </operation>
-      <parameter name="allowedMethods" value="setOwners setInheritPermission getOwners getPermissions getClassPermissions removeACEs getACLs addACEs hasPermissions"/>
+      <operation name="getAllAuthorities" qname="operNS:getAllAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getAllAuthorities" >
+        <parameter qname="pns:filter" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:AuthorityFilter" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="getAuthorities" qname="operNS:getAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getAuthorities" >
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="createAuthorities" qname="operNS:createAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/createAuthorities" >
+        <parameter qname="pns:parentAuthority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:newAuthorites" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:NewAuthority" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="deleteAuthorities" qname="operNS:deleteAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/deleteAuthorities" >
+        <parameter qname="pns:authorities" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="addChildAuthorities" qname="operNS:addChildAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/addChildAuthorities" >
+        <parameter qname="pns:parentAuthority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:authorities" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="removeChildAuthorities" qname="operNS:removeChildAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/removeChildAuthorities" >
+        <parameter qname="pns:parentAuthority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:authorities" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="getChildAuthorities" qname="operNS:getChildAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getChildAuthorities" >
+        <parameter qname="pns:authority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:filter" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:SiblingAuthorityFilter" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="getParentAuthorities" qname="operNS:getParentAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getParentAuthorities" >
+        <parameter qname="pns:authority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:filter" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:SiblingAuthorityFilter" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <parameter name="allowedMethods" value="setOwners deleteAuthorities getChildAuthorities getOwners getClassPermissions addACEs getParentAuthorities hasPermissions createAuthorities setInheritPermission getAllAuthorities getAuthorities getPermissions getACLs removeACEs addChildAuthorities removeChildAuthorities"/>
 
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
@@ -72,22 +108,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Cardinality"
-        type="java:org.alfresco.repo.webservice.types.Cardinality"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ClassDefinition"
-        type="java:org.alfresco.repo.webservice.types.ClassDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ContentFormat"
@@ -96,30 +116,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
-        qname="ns:GetPermissionsResult"
-        type="java:org.alfresco.repo.webservice.accesscontrol.GetPermissionsResult"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Version"
-        type="java:org.alfresco.repo.webservice.types.Version"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Node"
-        type="java:org.alfresco.repo.webservice.types.Node"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Predicate"
@@ -130,32 +126,8 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSetRow"
+        qname="ns:Node"
-        type="java:org.alfresco.repo.webservice.types.ResultSetRow"
+        type="java:org.alfresco.repo.webservice.types.Node"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Path"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSet"
-        type="java:org.alfresco.repo.webservice.types.ResultSet"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSetMetaData"
-        type="java:org.alfresco.repo.webservice.types.ResultSetMetaData"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
@@ -176,6 +148,14 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:SiblingAuthorityFilter"
+        type="java:org.alfresco.repo.webservice.accesscontrol.SiblingAuthorityFilter"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:NodeDefinition"
@@ -200,6 +180,158 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:AuthorityFilter"
+        type="java:org.alfresco.repo.webservice.accesscontrol.AuthorityFilter"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Reference"
+        type="java:org.alfresco.repo.webservice.types.Reference"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:UUID"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:NamedValue"
+        type="java:org.alfresco.repo.webservice.types.NamedValue"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:NewAuthority"
+        type="java:org.alfresco.repo.webservice.accesscontrol.NewAuthority"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:>ResultSetRow>node"
+        type="java:org.alfresco.repo.webservice.types.ResultSetRowNode"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:HasPermissionsResult"
+        type="java:org.alfresco.repo.webservice.accesscontrol.HasPermissionsResult"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Classification"
+        type="java:org.alfresco.repo.webservice.types.Classification"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:ACL"
+        type="java:org.alfresco.repo.webservice.accesscontrol.ACL"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Store"
+        type="java:org.alfresco.repo.webservice.types.Store"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:PropertyDefinition"
+        type="java:org.alfresco.repo.webservice.types.PropertyDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ClassDefinition"
+        type="java:org.alfresco.repo.webservice.types.ClassDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Cardinality"
+        type="java:org.alfresco.repo.webservice.types.Cardinality"
+        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:GetPermissionsResult"
+        type="java:org.alfresco.repo.webservice.accesscontrol.GetPermissionsResult"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Version"
+        type="java:org.alfresco.repo.webservice.types.Version"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Path"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ResultSetRow"
+        type="java:org.alfresco.repo.webservice.types.ResultSetRow"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ResultSet"
+        type="java:org.alfresco.repo.webservice.types.ResultSet"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ResultSetMetaData"
+        type="java:org.alfresco.repo.webservice.types.ResultSetMetaData"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
         qname="ns:OwnerResult"
@@ -232,30 +364,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Reference"
-        type="java:org.alfresco.repo.webservice.types.Reference"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:NamedValue"
-        type="java:org.alfresco.repo.webservice.types.NamedValue"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:UUID"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Name"
@@ -264,14 +372,6 @@
         deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>ResultSetRow>node"
-        type="java:org.alfresco.repo.webservice.types.ResultSetRowNode"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:>ContentFormat>encoding"
@@ -280,22 +380,6 @@
         deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
-        qname="ns:HasPermissionsResult"
-        type="java:org.alfresco.repo.webservice.accesscontrol.HasPermissionsResult"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Classification"
-        type="java:org.alfresco.repo.webservice.types.Classification"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
         qname="ns:AccessControlFault"
@@ -304,22 +388,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
-        qname="ns:ACL"
-        type="java:org.alfresco.repo.webservice.accesscontrol.ACL"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Store"
-        type="java:org.alfresco.repo.webservice.types.Store"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"
@@ -336,14 +404,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:PropertyDefinition"
-        type="java:org.alfresco.repo.webservice.types.PropertyDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:VersionHistory"

source/java/org/alfresco/repo/webservice/accesscontrol/AccessControlWebService.java

@@ -14,6 +14,8 @@ import org.alfresco.repo.webservice.types.Predicate;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AccessPermission;
 import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
 import org.alfresco.service.cmr.security.OwnableService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
@@ -34,6 +36,9 @@ public class AccessControlWebService extends AbstractWebService implements Acces
     /** Ownable service */
     private OwnableService ownableService = null;
     
+    /** Authority service */
+    private AuthorityService authorityService;
+    
     /**
      * Set the transaction service
      * 
@@ -64,6 +69,16 @@ public class AccessControlWebService extends AbstractWebService implements Acces
         this.ownableService = ownableService;
     }
     
+    /**
+     * Set the authentication service
+     * 
+     * @param authorityService	the authentication service
+     */
+    public void setAuthorityService(AuthorityService authorityService) 
+    {
+		this.authorityService = authorityService;
+	}
+    
     /**
      * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#getACLs(org.alfresco.repo.webservice.types.Predicate, org.alfresco.repo.webservice.accesscontrol.ACE)
      */
@@ -150,7 +165,10 @@ public class AccessControlWebService extends AbstractWebService implements Acces
             {
                 accessStatus = org.alfresco.repo.webservice.accesscontrol.AccessStatus.acepted;
             }
-            ACE ace = new ACE(permission.getAuthority(),permission.getPermission(), accessStatus);
+            
+            ACE ace = new ACE(permission.getAuthority(),
+            				  permission.getPermission(), 
+            				  accessStatus);
             
             // Add ace to array
             aces[count] = ace;
@@ -215,7 +233,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces
                 this.permissionService.setPermission(node, ace.getAuthority(), ace.getPermission(), allow);
             }
             
-            // Add the ACL forthis node to the returned array
+            // Add the ACL for this node to the returned array
             acls[count] = getACLFromNodeRef(node, null);
             count++;
         }
@@ -280,7 +298,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces
                 }
             }
             
-            // Add the ACL forthis node to the returned array
+            // Add the ACL for this node to the returned array
             acls[count] = getACLFromNodeRef(node, null);
             count++;
         }
@@ -623,4 +641,133 @@ public class AccessControlWebService extends AbstractWebService implements Acces
         
         return result;
     }
+
+    /**
+     * Add an existing authority as a child of another authority.
+     * 
+     * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#addChildAuthorities(java.lang.String, java.lang.String[])
+     */
+	public String[] addChildAuthorities(String parentAuthority, String[] authorities) 
+		throws RemoteException, AccessControlFault 
+	{
+		String[] result = new String[authorities.length];
+		int index = 0;
+		for (String authority : authorities) 
+		{
+			this.authorityService.addAuthority(parentAuthority, authority);
+			result[index] = authority;
+			index++;
+		}
+		return result;
+	}
+
+	/**
+	 * Creates a new authority under a given parent authority.  If no parent authority is provided then the new authority is
+	 * created at the root.
+	 * 
+	 * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#createAuthorities(java.lang.String, org.alfresco.repo.webservice.accesscontrol.NewAuthority[])
+	 */
+	public String[] createAuthorities(String parentAuthority, NewAuthority[] newAuthorites) 
+		throws RemoteException, AccessControlFault 
+	{
+		String[] result = new String[newAuthorites.length];
+		int index = 0;
+		for (NewAuthority newAuthority : newAuthorites) 
+		{
+			AuthorityType authorityType = AuthorityType.valueOf(newAuthority.getAuthorityType());
+			String authority = this.authorityService.createAuthority(authorityType, parentAuthority, newAuthority.getName());
+			result[index] = authority;
+			index++;
+		}		
+		return result;
+	}
+
+	/**
+	 * Delete existing authority
+	 * 
+	 * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#deleteAuthorities(java.lang.String[])
+	 */
+	public void deleteAuthorities(String[] authorities) 
+		throws RemoteException, AccessControlFault 
+	{
+		for (String authority : authorities) 
+		{
+			this.authorityService.deleteAuthority(authority);
+		}
+	}
+
+	/**
+	 * Get all authorities that match the filter
+	 * 
+	 * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#getAllAuthorities(org.alfresco.repo.webservice.accesscontrol.AuthorityFilter)
+	 */
+	public String[] getAllAuthorities(AuthorityFilter filter)
+			throws RemoteException, AccessControlFault 
+	{
+		List<String> result = new ArrayList<String>(10);
+		
+		AuthorityType authorityType = AuthorityType.valueOf(filter.getAuthorityType());
+		if (filter.isRootOnly() == true)
+		{
+			result.addAll(this.authorityService.getAllRootAuthorities(authorityType));
+		}
+		else
+		{
+			result.addAll(this.authorityService.getAllAuthorities(authorityType));
+		}
+		
+		return (String[])result.toArray(new String[result.size()]);
+	}
+
+	/**
+	 * Gets all the authorities that the current user belongs to
+	 * 
+	 * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#getAuthorities()
+	 */
+	public String[] getAuthorities() 
+		throws RemoteException, AccessControlFault 
+	{
+		Set<String> result = this.authorityService.getAuthorities();
+		return (String[])result.toArray(new String[result.size()]);
+	}
+
+	/**
+	 * Gets all the child authorities of a given authority, taking into account a filter
+	 * 
+	 * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#getChildAuthorities(java.lang.String, org.alfresco.repo.webservice.accesscontrol.SiblingAuthorityFilter)
+	 */
+	public String[] getChildAuthorities(String authority, SiblingAuthorityFilter filter) 
+		throws RemoteException, AccessControlFault 
+	{
+		AuthorityType authorityType = AuthorityType.valueOf(filter.getAuthorityType());
+		Set<String> result = this.authorityService.getContainedAuthorities(authorityType, authority, filter.isImmediate());
+		return (String[])result.toArray(new String[result.size()]);
+	}
+
+	/**
+	 * Gets all the parent authorities of a given authority, taking into account a filter
+	 * 
+	 * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#getParentAuthorities(java.lang.String, org.alfresco.repo.webservice.accesscontrol.SiblingAuthorityFilter)
+	 */
+	public String[] getParentAuthorities(String authority, SiblingAuthorityFilter filter) 
+		throws RemoteException, AccessControlFault 
+	{
+		AuthorityType authorityType = AuthorityType.valueOf(filter.getAuthorityType());
+		Set<String> result = this.authorityService.getContainingAuthorities(authorityType, authority, filter.isImmediate());
+		return (String[])result.toArray(new String[result.size()]);
+	}
+
+	/**
+	 * Remove a child authority
+	 * 
+	 * @see org.alfresco.repo.webservice.accesscontrol.AccessControlServiceSoapPort#removeChildAuthorities(java.lang.String, java.lang.String[])
+	 */
+	public void removeChildAuthorities(String parentAuthority, String[] authorities) 
+		throws RemoteException, AccessControlFault 
+	{
+		for (String authority : authorities) 
+		{
+			this.authorityService.removeAuthority(parentAuthority, authority);
+		}		
+	}
 }

source/java/web-services-application-context.xml

@@ -191,6 +191,9 @@
       <property name="ownableService">
          <ref bean="OwnableService"/>
       </property>
+      <property name="authorityService">
+      	 <ref bean="AuthorityService"/>
+      </property>
    </bean>
    
    <bean id="administrationWebService" class="org.alfresco.repo.webservice.administration.AdministrationWebService">

source/web/WEB-INF/server-config.wsdd

@@ -2276,7 +2276,43 @@
         <parameter qname="pns:owner" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
       </operation>
-      <parameter name="allowedMethods" value="setOwners setInheritPermission getOwners getPermissions getClassPermissions removeACEs getACLs addACEs hasPermissions"/>
+      <operation name="getAllAuthorities" qname="operNS:getAllAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getAllAuthorities" >
+        <parameter qname="pns:filter" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:AuthorityFilter" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="getAuthorities" qname="operNS:getAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getAuthorities" >
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="createAuthorities" qname="operNS:createAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/createAuthorities" >
+        <parameter qname="pns:parentAuthority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:newAuthorites" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:NewAuthority" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="deleteAuthorities" qname="operNS:deleteAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/deleteAuthorities" >
+        <parameter qname="pns:authorities" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="addChildAuthorities" qname="operNS:addChildAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/addChildAuthorities" >
+        <parameter qname="pns:parentAuthority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:authorities" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="removeChildAuthorities" qname="operNS:removeChildAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/removeChildAuthorities" >
+        <parameter qname="pns:parentAuthority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:authorities" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="getChildAuthorities" qname="operNS:getChildAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getChildAuthorities" >
+        <parameter qname="pns:authority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:filter" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:SiblingAuthorityFilter" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <operation name="getParentAuthorities" qname="operNS:getParentAuthorities" xmlns:operNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnQName="retNS:results" xmlns:retNS="http://www.alfresco.org/ws/service/accesscontrol/1.0" returnType="rtns:string" xmlns:rtns="http://www.w3.org/2001/XMLSchema" soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getParentAuthorities" >
+        <parameter qname="pns:authority" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
+        <parameter qname="pns:filter" xmlns:pns="http://www.alfresco.org/ws/service/accesscontrol/1.0" type="tns:SiblingAuthorityFilter" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+        <fault name="AccessControlFault" qname="fns:AccessControlFault" xmlns:fns="http://www.alfresco.org/ws/service/accesscontrol/1.0" class="org.alfresco.repo.webservice.accesscontrol.AccessControlFault" type="tns:AccessControlFault" xmlns:tns="http://www.alfresco.org/ws/service/accesscontrol/1.0"/>
+      </operation>
+      <parameter name="allowedMethods" value="setOwners deleteAuthorities getChildAuthorities getOwners getClassPermissions addACEs getParentAuthorities hasPermissions createAuthorities setInheritPermission getAllAuthorities getAuthorities getPermissions getACLs removeACEs addChildAuthorities removeChildAuthorities"/>
 
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
@@ -2286,22 +2322,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Cardinality"
-        type="java:org.alfresco.repo.webservice.types.Cardinality"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ClassDefinition"
-        type="java:org.alfresco.repo.webservice.types.ClassDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ContentFormat"
@@ -2310,30 +2330,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
-        qname="ns:GetPermissionsResult"
-        type="java:org.alfresco.repo.webservice.accesscontrol.GetPermissionsResult"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Version"
-        type="java:org.alfresco.repo.webservice.types.Version"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Node"
-        type="java:org.alfresco.repo.webservice.types.Node"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Predicate"
@@ -2344,32 +2340,8 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSetRow"
+        qname="ns:Node"
-        type="java:org.alfresco.repo.webservice.types.ResultSetRow"
+        type="java:org.alfresco.repo.webservice.types.Node"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Path"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSet"
-        type="java:org.alfresco.repo.webservice.types.ResultSet"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSetMetaData"
-        type="java:org.alfresco.repo.webservice.types.ResultSetMetaData"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
@@ -2390,6 +2362,14 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:SiblingAuthorityFilter"
+        type="java:org.alfresco.repo.webservice.accesscontrol.SiblingAuthorityFilter"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:NodeDefinition"
@@ -2414,6 +2394,158 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:AuthorityFilter"
+        type="java:org.alfresco.repo.webservice.accesscontrol.AuthorityFilter"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Reference"
+        type="java:org.alfresco.repo.webservice.types.Reference"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:UUID"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:NamedValue"
+        type="java:org.alfresco.repo.webservice.types.NamedValue"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:NewAuthority"
+        type="java:org.alfresco.repo.webservice.accesscontrol.NewAuthority"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:>ResultSetRow>node"
+        type="java:org.alfresco.repo.webservice.types.ResultSetRowNode"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:HasPermissionsResult"
+        type="java:org.alfresco.repo.webservice.accesscontrol.HasPermissionsResult"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Classification"
+        type="java:org.alfresco.repo.webservice.types.Classification"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:ACL"
+        type="java:org.alfresco.repo.webservice.accesscontrol.ACL"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Store"
+        type="java:org.alfresco.repo.webservice.types.Store"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:PropertyDefinition"
+        type="java:org.alfresco.repo.webservice.types.PropertyDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ClassDefinition"
+        type="java:org.alfresco.repo.webservice.types.ClassDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Cardinality"
+        type="java:org.alfresco.repo.webservice.types.Cardinality"
+        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
+        qname="ns:GetPermissionsResult"
+        type="java:org.alfresco.repo.webservice.accesscontrol.GetPermissionsResult"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Version"
+        type="java:org.alfresco.repo.webservice.types.Version"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Path"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ResultSetRow"
+        type="java:org.alfresco.repo.webservice.types.ResultSetRow"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ResultSet"
+        type="java:org.alfresco.repo.webservice.types.ResultSet"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ResultSetMetaData"
+        type="java:org.alfresco.repo.webservice.types.ResultSetMetaData"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
         qname="ns:OwnerResult"
@@ -2446,30 +2578,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Reference"
-        type="java:org.alfresco.repo.webservice.types.Reference"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:NamedValue"
-        type="java:org.alfresco.repo.webservice.types.NamedValue"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:UUID"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Name"
@@ -2478,14 +2586,6 @@
         deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>ResultSetRow>node"
-        type="java:org.alfresco.repo.webservice.types.ResultSetRowNode"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:>ContentFormat>encoding"
@@ -2494,22 +2594,6 @@
         deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
-        qname="ns:HasPermissionsResult"
-        type="java:org.alfresco.repo.webservice.accesscontrol.HasPermissionsResult"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Classification"
-        type="java:org.alfresco.repo.webservice.types.Classification"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
         qname="ns:AccessControlFault"
@@ -2518,30 +2602,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/accesscontrol/1.0"
-        qname="ns:ACL"
-        type="java:org.alfresco.repo.webservice.accesscontrol.ACL"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Store"
-        type="java:org.alfresco.repo.webservice.types.Store"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"
@@ -2558,14 +2618,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:PropertyDefinition"
-        type="java:org.alfresco.repo.webservice.types.PropertyDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:VersionHistory"

source/wsdl/access-control-service.wsdl

@@ -26,6 +26,14 @@
 	    	 </xsd:restriction>
 	     </xsd:simpleType>
 
+		<complexType name="NewAuthority">
+			<sequence>
+				<element name="authorityType" type="xsd:string"/>
+				<element name="name" type="xsd:string"/>
+			</sequence>
+		</complexType>
+		<element name="NewAuthority" type="acs:NewAuthority"/>
+
          <complexType name="ACE">
             <sequence>
                <element name="authority" type="xsd:string"/>
@@ -75,7 +83,23 @@
                <element name="owner" type="xsd:string"/>
             </sequence>
          </complexType>
-         <element name="OwnerResult" type="acs:OwnerResult"/>        
+         <element name="OwnerResult" type="acs:OwnerResult"/>    
+         
+         <complexType name="AuthorityFilter">
+         	<sequence>         		
+				<element name="authorityType" type="xsd:string" nillable="true"/>
+				<element name="rootOnly" type="xsd:boolean"/>
+         	</sequence>
+         </complexType>    
+         <element name="AuthorityFilter" type="acs:AuthorityFilter"/>
+
+		<complexType name="SiblingAuthorityFilter">
+			<sequence>
+				<element name="authorityType" type="xsd:string" nillable="true"/>
+				<element name="immediate" type="xsd:boolean"/>
+			</sequence>
+		</complexType>
+		<element name="SiblingAuthorityFilter" type="acs:SiblingAuthorityFilter"/>
 
          <complexType name="AccessControlFault">
             <sequence>
@@ -235,7 +259,134 @@
                   <element name="results" type="acs:OwnerResult" maxOccurs="unbounded" minOccurs="0"/>
                </sequence>
             </complexType>
-         </element>        
+         </element>   
+         
+		<element name="getAllAuthorities">
+			<complexType>
+				<sequence>
+					<element name="filter" type="acs:AuthorityFilter" maxOccurs="1" minOccurs="1"/>
+				</sequence>
+			</complexType>
+		</element>         
+		         
+		<element name="getAllAuthoritiesResponse">
+			<complexType>
+				<sequence>
+					<element name="results" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+				</sequence>
+			</complexType>
+		</element>     
+         
+		<element name="getAuthorities">
+			<complexType>
+				<sequence/>
+			</complexType>
+		</element>              
+         
+		<element name="getAuthoritiesResponse">
+			<complexType>
+				<sequence>
+					<element name="results" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="createAuthorities">
+			<complexType>
+				<sequence>
+					<element name="parentAuthority" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"/>
+					<element name="newAuthorites" type="acs:NewAuthority" maxOccurs="unbounded" minOccurs="1" />
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="createAuthoritiesResponse">
+			<complexType>
+				<sequence>
+					<element name="results" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="deleteAuthorities">
+			<complexType>
+				<sequence>
+					<element name="authorities" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="deleteAuthoritiesResponse">
+			<complexType>
+				<sequence/>
+			</complexType>
+		</element>              
+         
+		<element name="addChildAuthorities">
+			<complexType>
+				<sequence>
+					<element name="parentAuthority" type="xsd:string" maxOccurs="1" minOccurs="1" />
+					<element name="authorities" type="xsd:string" maxOccurs="unbounded" minOccurs="1" />
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="addChildAuthoritiesResponse">
+			<complexType>
+				<sequence>
+					<element name="results" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="removeChildAuthorities">
+			<complexType>
+				<sequence>
+					<element name="parentAuthority" type="xsd:string" maxOccurs="1" minOccurs="1" />
+					<element name="authorities" type="xsd:string" maxOccurs="unbounded" minOccurs="1" />
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="removeChildAuthoritiesResponse">
+			<complexType>
+				<sequence/>
+			</complexType>
+		</element>              
+         
+		<element name="getChildAuthorities">
+			<complexType>
+				<sequence>
+					<element name="authority" type="xsd:string" maxOccurs="1" minOccurs="1"/>
+					<element name="filter" type="acs:SiblingAuthorityFilter" maxOccurs="1" minOccurs="1"/>
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="getChildAuthoritiesResponse">
+			<complexType>
+				<sequence>
+					<element name="results" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+				</sequence>
+			</complexType>
+		</element>               
+         
+		<element name="getParentAuthorities">
+			<complexType>
+				<sequence>
+					<element name="authority" type="xsd:string" maxOccurs="1" minOccurs="1"/>
+					<element name="filter" type="acs:SiblingAuthorityFilter" maxOccurs="1" minOccurs="1"/>
+				</sequence>
+			</complexType>
+		</element>              
+         
+		<element name="getParentAuthoritiesResponse">
+			<complexType>
+				<sequence>
+					<element name="results" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+				</sequence>
+			</complexType>
+		</element>                          
 
       </schema>
    </wsdl:types>
@@ -313,6 +464,70 @@
    <wsdl:message name="setOwnersResponse">
       <wsdl:part element="acs:setOwnersResponse" name="parameters"/>
    </wsdl:message>
+      
+   <wsdl:message name="getAllAuthorities">
+      <wsdl:part element="acs:getAllAuthorities" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="getAllAuthoritiesResponse">
+      <wsdl:part element="acs:getAllAuthoritiesResponse" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="getAuthorities">
+      <wsdl:part element="acs:getAuthorities" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="getAuthoritiesResponse">
+      <wsdl:part element="acs:getAuthoritiesResponse" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="createAuthorities">
+      <wsdl:part element="acs:createAuthorities" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="createAuthoritiesResponse">
+      <wsdl:part element="acs:createAuthoritiesResponse" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="deleteAuthorities">
+      <wsdl:part element="acs:deleteAuthorities" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="deleteAuthoritiesResponse">
+      <wsdl:part element="acs:deleteAuthoritiesResponse" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="addChildAuthorities">
+      <wsdl:part element="acs:addChildAuthorities" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="addChildAuthoritiesResponse">
+      <wsdl:part element="acs:addChildAuthoritiesResponse" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="removeChildAuthorities">
+      <wsdl:part element="acs:removeChildAuthorities" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="removeChildAuthoritiesResponse">
+      <wsdl:part element="acs:removeChildAuthoritiesResponse" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="getChildAuthorities">
+      <wsdl:part element="acs:getChildAuthorities" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="getChildAuthoritiesResponse">
+      <wsdl:part element="acs:getChildAuthoritiesResponse" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="getParentAuthorities">
+      <wsdl:part element="acs:getParentAuthorities" name="parameters"/>
+   </wsdl:message>
+      
+   <wsdl:message name="getParentAuthoritiesResponse">
+      <wsdl:part element="acs:getParentAuthoritiesResponse" name="parameters"/>
+   </wsdl:message>
    
    <wsdl:message name="AccessControlFault">
       <wsdl:part element="acs:AccessControlFault" name="fault"/>
@@ -375,6 +590,54 @@
          <wsdl:output message="acs:setOwnersResponse" name="setOwnersResponse"/>
          <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
       </wsdl:operation>
+      <wsdl:operation name="getAllAuthorities">
+         <wsdl:documentation>Getsl aa the authorities avaialble in the repository.</wsdl:documentation>
+         <wsdl:input message="acs:getAllAuthorities" name="getAllAuthorities"/>
+         <wsdl:output message="acs:getAllAuthoritiesResponse" name="getAllAuthoritiesResponse"/>
+         <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
+      </wsdl:operation>
+      <wsdl:operation name="getAuthorities">
+         <wsdl:documentation>Ges the authorities for the current user</wsdl:documentation>
+         <wsdl:input message="acs:getAuthorities" name="getAuthorities"/>
+         <wsdl:output message="acs:getAuthoritiesResponse" name="getAuthoritiesResponse"/>
+         <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
+      </wsdl:operation>
+      <wsdl:operation name="createAuthorities">
+         <wsdl:documentation>Creates new authorities</wsdl:documentation>
+         <wsdl:input message="acs:createAuthorities" name="createAuthorities"/>
+         <wsdl:output message="acs:createAuthoritiesResponse" name="createAuthoritiesResponse"/>
+         <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
+      </wsdl:operation>
+      <wsdl:operation name="deleteAuthorities">
+         <wsdl:documentation>Delete authorities</wsdl:documentation>
+         <wsdl:input message="acs:deleteAuthorities" name="deleteAuthorities"/>
+         <wsdl:output message="acs:deleteAuthoritiesResponse" name="deleteAuthoritiesResponse"/>
+         <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
+      </wsdl:operation>
+      <wsdl:operation name="addChildAuthorities">
+         <wsdl:documentation>Adds child authorities to a specified parent authority</wsdl:documentation>
+         <wsdl:input message="acs:addChildAuthorities" name="addChildAuthorities"/>
+         <wsdl:output message="acs:addChildAuthoritiesResponse" name="addChildAuthoritiesResponse"/>
+         <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
+      </wsdl:operation>
+      <wsdl:operation name="removeChildAuthorities">
+         <wsdl:documentation>Remove child authorities from the specified parent authority</wsdl:documentation>
+         <wsdl:input message="acs:removeChildAuthorities" name="removeChildAuthorities"/>
+         <wsdl:output message="acs:removeChildAuthoritiesResponse" name="removeChildAuthoritiesResponse"/>
+         <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
+      </wsdl:operation>
+      <wsdl:operation name="getChildAuthorities">
+         <wsdl:documentation>Gets an authorities child authorities</wsdl:documentation>
+         <wsdl:input message="acs:getChildAuthorities" name="getChildAuthorities"/>
+         <wsdl:output message="acs:getChildAuthoritiesResponse" name="getChildAuthoritiesResponse"/>
+         <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
+      </wsdl:operation>
+      <wsdl:operation name="getParentAuthorities">
+         <wsdl:documentation>Gets an authorities parent authorities</wsdl:documentation>
+         <wsdl:input message="acs:getParentAuthorities" name="getParentAuthorities"/>
+         <wsdl:output message="acs:getParentAuthoritiesResponse" name="getParentAuthoritiesResponse"/>
+         <wsdl:fault message="acs:AccessControlFault" name="AccessControlFault"/>
+      </wsdl:operation>
    </wsdl:portType>
    
    <wsdl:binding name="AccessControlServiceSoapBinding" type="acs:AccessControlServiceSoapPort">
@@ -487,6 +750,102 @@
             <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
          </wsdl:fault>
       </wsdl:operation>
+      <wsdl:operation name="getAllAuthorities">
+         <wsdlsoap:operation soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getAllAuthorities"/>
+         <wsdl:input>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:output>
+         <wsdl:fault name="AccessControlFault">
+            <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
+         </wsdl:fault>
+      </wsdl:operation>
+      <wsdl:operation name="getAuthorities">
+         <wsdlsoap:operation soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getAuthorities"/>
+         <wsdl:input>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:output>
+         <wsdl:fault name="AccessControlFault">
+            <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
+         </wsdl:fault>
+      </wsdl:operation>
+      <wsdl:operation name="createAuthorities">
+         <wsdlsoap:operation soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/createAuthorities"/>
+         <wsdl:input>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:output>
+         <wsdl:fault name="AccessControlFault">
+            <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
+         </wsdl:fault>
+      </wsdl:operation>
+      <wsdl:operation name="deleteAuthorities">
+         <wsdlsoap:operation soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/deleteAuthorities"/>
+         <wsdl:input>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:output>
+         <wsdl:fault name="AccessControlFault">
+            <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
+         </wsdl:fault>
+      </wsdl:operation>
+      <wsdl:operation name="addChildAuthorities">
+         <wsdlsoap:operation soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/addChildAuthorities"/>
+         <wsdl:input>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:output>
+         <wsdl:fault name="AccessControlFault">
+            <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
+         </wsdl:fault>
+      </wsdl:operation>
+      <wsdl:operation name="removeChildAuthorities">
+         <wsdlsoap:operation soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/removeChildAuthorities"/>
+         <wsdl:input>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:output>
+         <wsdl:fault name="AccessControlFault">
+            <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
+         </wsdl:fault>
+      </wsdl:operation>
+      <wsdl:operation name="getChildAuthorities">
+         <wsdlsoap:operation soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getChildAuthorities"/>
+         <wsdl:input>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:output>
+         <wsdl:fault name="AccessControlFault">
+            <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
+         </wsdl:fault>
+      </wsdl:operation>
+      <wsdl:operation name="getParentAuthorities">
+         <wsdlsoap:operation soapAction="http://www.alfresco.org/ws/service/accesscontrol/1.0/getParentAuthorities"/>
+         <wsdl:input>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <wsdlsoap:body use="literal"/>
+         </wsdl:output>
+         <wsdl:fault name="AccessControlFault">
+            <wsdlsoap:fault namespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" use="literal" name="AccessControlFault"/>
+         </wsdl:fault>
+      </wsdl:operation>
     </wsdl:binding>
 
 	<!-- Service definition -->