Merged CMIS063 to HEAD

15463: Fixed MOB-1100: Update Web Services to 0.62 final

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

source/generated/org/alfresco/repo/cmis/ws/ACLService.java

@@ -0,0 +1,77 @@
+
+/*
+ * 
+ */
+
+package org.alfresco.repo.cmis.ws;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+/**
+ * This class was generated by Apache CXF 2.1.2
+ * Fri Jul 24 09:58:27 EEST 2009
+ * Generated source version: 2.1.2
+ * 
+ */
+
+
+@WebServiceClient(name = "ACLService", 
+                  wsdlLocation = "file:/D:/work/alfresco-cmis/WS-Binding-062f/source/wsdl/CMISWS-Service.wsdl",
+                  targetNamespace = "http://docs.oasis-open.org/ns/cmis/ws/200901") 
+public class ACLService extends Service {
+
+    public final static URL WSDL_LOCATION;
+    public final static QName SERVICE = new QName("http://docs.oasis-open.org/ns/cmis/ws/200901", "ACLService");
+    public final static QName ACLServicePort = new QName("http://docs.oasis-open.org/ns/cmis/ws/200901", "ACLServicePort");
+    static {
+        URL url = null;
+        try {
+            url = new URL("file:/D:/work/alfresco-cmis/WS-Binding-062f/source/wsdl/CMISWS-Service.wsdl");
+        } catch (MalformedURLException e) {
+            System.err.println("Can not initialize the default wsdl from file:/D:/work/alfresco-cmis/WS-Binding-062f/source/wsdl/CMISWS-Service.wsdl");
+            // e.printStackTrace();
+        }
+        WSDL_LOCATION = url;
+    }
+
+    public ACLService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
+    }
+
+    public ACLService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public ACLService() {
+        super(WSDL_LOCATION, SERVICE);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns ACLServicePort
+     */
+    @WebEndpoint(name = "ACLServicePort")
+    public ACLServicePort getACLServicePort() {
+        return super.getPort(ACLServicePort, ACLServicePort.class);
+    }
+
+    /**
+     * 
+     * @param features
+     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
+     * @return
+     *     returns ACLServicePort
+     */
+    @WebEndpoint(name = "ACLServicePort")
+    public ACLServicePort getACLServicePort(WebServiceFeature... features) {
+        return super.getPort(ACLServicePort, ACLServicePort.class, features);
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/ACLServicePort.java

@@ -0,0 +1,55 @@
+package org.alfresco.repo.cmis.ws;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebParam.Mode;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF 2.1.2
+ * Fri Jul 24 09:58:27 EEST 2009
+ * Generated source version: 2.1.2
+ * 
+ */
+ 
+@WebService(targetNamespace = "http://docs.oasis-open.org/ns/cmis/ws/200901", name = "ACLServicePort")
+@XmlSeeAlso({ObjectFactory.class})
+public interface ACLServicePort {
+
+    @ResponseWrapper(localName = "getACLResponse", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", className = "org.alfresco.repo.cmis.ws.GetACLResponse")
+    @RequestWrapper(localName = "getACL", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", className = "org.alfresco.repo.cmis.ws.GetACL")
+    @WebResult(name = "acl", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+    @WebMethod
+    public org.alfresco.repo.cmis.ws.CmisAccessControlListType getACL(
+        @WebParam(name = "repositoryId", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        java.lang.String repositoryId,
+        @WebParam(name = "objectId", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        java.lang.String objectId,
+        @WebParam(name = "onlyBasicPermissions", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        boolean onlyBasicPermissions
+    ) throws CmisException;
+
+    @ResponseWrapper(localName = "applyACLResponse", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", className = "org.alfresco.repo.cmis.ws.ApplyACLResponse")
+    @RequestWrapper(localName = "applyACL", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", className = "org.alfresco.repo.cmis.ws.ApplyACL")
+    @WebMethod
+    public void applyACL(
+        @WebParam(name = "repositoryId", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        java.lang.String repositoryId,
+        @WebParam(name = "objectId", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        java.lang.String objectId,
+        @WebParam(name = "addACEs", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        org.alfresco.repo.cmis.ws.CmisAccessControlListType addACEs,
+        @WebParam(name = "removeACEs", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        org.alfresco.repo.cmis.ws.CmisAccessControlListType removeACEs,
+        @WebParam(name = "propogationType", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        org.alfresco.repo.cmis.ws.EnumACLPropagation propogationType,
+        @WebParam(mode = WebParam.Mode.OUT, name = "ACL", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        javax.xml.ws.Holder<java.util.List<org.alfresco.repo.cmis.ws.CmisAccessControlListType>> acl,
+        @WebParam(mode = WebParam.Mode.OUT, name = "exact", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        javax.xml.ws.Holder<java.lang.Boolean> exact
+    ) throws CmisException;
+}

source/generated/org/alfresco/repo/cmis/ws/ApplyACL.java

@@ -0,0 +1,178 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="objectId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="addACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType"/>
+ *         &lt;element name="removeACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType"/>
+ *         &lt;element name="propogationType" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumACLPropagation" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "repositoryId",
+    "objectId",
+    "addACEs",
+    "removeACEs",
+    "propogationType"
+})
+@XmlRootElement(name = "applyACL")
+public class ApplyACL {
+
+    @XmlElement(required = true)
+    protected String repositoryId;
+    @XmlElement(required = true)
+    protected String objectId;
+    @XmlElement(required = true)
+    protected CmisAccessControlListType addACEs;
+    @XmlElement(required = true)
+    protected CmisAccessControlListType removeACEs;
+    @XmlElementRef(name = "propogationType", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<EnumACLPropagation> propogationType;
+
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
+    /**
+     * Gets the value of the objectId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getObjectId() {
+        return objectId;
+    }
+
+    /**
+     * Sets the value of the objectId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setObjectId(String value) {
+        this.objectId = value;
+    }
+
+    /**
+     * Gets the value of the addACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CmisAccessControlListType }
+     *     
+     */
+    public CmisAccessControlListType getAddACEs() {
+        return addACEs;
+    }
+
+    /**
+     * Sets the value of the addACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisAccessControlListType }
+     *     
+     */
+    public void setAddACEs(CmisAccessControlListType value) {
+        this.addACEs = value;
+    }
+
+    /**
+     * Gets the value of the removeACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CmisAccessControlListType }
+     *     
+     */
+    public CmisAccessControlListType getRemoveACEs() {
+        return removeACEs;
+    }
+
+    /**
+     * Sets the value of the removeACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisAccessControlListType }
+     *     
+     */
+    public void setRemoveACEs(CmisAccessControlListType value) {
+        this.removeACEs = value;
+    }
+
+    /**
+     * Gets the value of the propogationType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link EnumACLPropagation }{@code >}
+     *     
+     */
+    public JAXBElement<EnumACLPropagation> getPropogationType() {
+        return propogationType;
+    }
+
+    /**
+     * Sets the value of the propogationType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link EnumACLPropagation }{@code >}
+     *     
+     */
+    public void setPropogationType(JAXBElement<EnumACLPropagation> value) {
+        this.propogationType = ((JAXBElement<EnumACLPropagation> ) value);
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/ApplyACLResponse.java

@@ -0,0 +1,90 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ACL" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" maxOccurs="unbounded"/>
+ *         &lt;element name="exact" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "acl",
+    "exact"
+})
+@XmlRootElement(name = "applyACLResponse")
+public class ApplyACLResponse {
+
+    @XmlElement(name = "ACL", required = true)
+    protected List<CmisAccessControlListType> acl;
+    protected boolean exact;
+
+    /**
+     * Gets the value of the acl property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the acl property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getACL().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisAccessControlListType }
+     * 
+     * 
+     */
+    public List<CmisAccessControlListType> getACL() {
+        if (acl == null) {
+            acl = new ArrayList<CmisAccessControlListType>();
+        }
+        return this.acl;
+    }
+
+    /**
+     * Gets the value of the exact property.
+     * 
+     */
+    public boolean isExact() {
+        return exact;
+    }
+
+    /**
+     * Sets the value of the exact property.
+     * 
+     */
+    public void setExact(boolean value) {
+        this.exact = value;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CheckIn.java

@@ -1,6 +1,8 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,8 +26,11 @@ import javax.xml.bind.annotation.XmlType;
  *         <element name="documentId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="major" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="properties" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertiesType" minOccurs="0"/>
- *         <element name="contentStream" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisContentStreamType" minOccurs="0"/>
+ *         <element name="contentStream" type="{http://docs.oasis-open.org/ns/cmis/messaging/200901}cmisContentStreamType" minOccurs="0"/>
  *         <element name="checkinComment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="applyPolicies" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="addACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
+ *         <element name="removeACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -41,7 +46,10 @@ import javax.xml.bind.annotation.XmlType;
     "major",
     "properties",
     "contentStream",
-    "checkinComment"
+    "checkinComment",
+    "applyPolicies",
+    "addACEs",
+    "removeACEs"
 })
 @XmlRootElement(name = "checkIn")
 public class CheckIn {
@@ -58,6 +66,12 @@ public class CheckIn {
     protected JAXBElement<CmisContentStreamType> contentStream;
     @XmlElementRef(name = "checkinComment", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<String> checkinComment;
+    @XmlElement(nillable = true)
+    protected List<String> applyPolicies;
+    @XmlElementRef(name = "addACEs", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<CmisAccessControlListType> addACEs;
+    @XmlElementRef(name = "removeACEs", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<CmisAccessControlListType> removeACEs;
 
     /**
      * Gets the value of the repositoryId property.
@@ -203,4 +217,81 @@ public class CheckIn {
         this.checkinComment = ((JAXBElement<String> ) value);
     }
 
+    /**
+     * Gets the value of the applyPolicies property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the applyPolicies property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getApplyPolicies().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getApplyPolicies() {
+        if (applyPolicies == null) {
+            applyPolicies = new ArrayList<String>();
+        }
+        return this.applyPolicies;
+    }
+
+    /**
+     * Gets the value of the addACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public JAXBElement<CmisAccessControlListType> getAddACEs() {
+        return addACEs;
+    }
+
+    /**
+     * Sets the value of the addACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public void setAddACEs(JAXBElement<CmisAccessControlListType> value) {
+        this.addACEs = ((JAXBElement<CmisAccessControlListType> ) value);
+    }
+
+    /**
+     * Gets the value of the removeACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public JAXBElement<CmisAccessControlListType> getRemoveACEs() {
+        return removeACEs;
+    }
+
+    /**
+     * Sets the value of the removeACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public void setRemoveACEs(JAXBElement<CmisAccessControlListType> value) {
+        this.removeACEs = ((JAXBElement<CmisAccessControlListType> ) value);
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/CmisACLCapabilityType.java

@@ -0,0 +1,129 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for cmisACLCapabilityType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisACLCapabilityType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="setType" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumACLPropagation"/>
+ *         &lt;element name="permissions" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPermissionDefinition" maxOccurs="unbounded"/>
+ *         &lt;element name="mapping" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPermissionMapping" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisACLCapabilityType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "setType",
+    "permissions",
+    "mapping"
+})
+public class CmisACLCapabilityType {
+
+    @XmlElement(required = true)
+    protected EnumACLPropagation setType;
+    @XmlElement(required = true)
+    protected List<CmisPermissionDefinition> permissions;
+    protected List<CmisPermissionMapping> mapping;
+
+    /**
+     * Gets the value of the setType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnumACLPropagation }
+     *     
+     */
+    public EnumACLPropagation getSetType() {
+        return setType;
+    }
+
+    /**
+     * Sets the value of the setType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnumACLPropagation }
+     *     
+     */
+    public void setSetType(EnumACLPropagation value) {
+        this.setType = value;
+    }
+
+    /**
+     * Gets the value of the permissions property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the permissions property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPermissions().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisPermissionDefinition }
+     * 
+     * 
+     */
+    public List<CmisPermissionDefinition> getPermissions() {
+        if (permissions == null) {
+            permissions = new ArrayList<CmisPermissionDefinition>();
+        }
+        return this.permissions;
+    }
+
+    /**
+     * Gets the value of the mapping property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the mapping property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getMapping().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisPermissionMapping }
+     * 
+     * 
+     */
+    public List<CmisPermissionMapping> getMapping() {
+        if (mapping == null) {
+            mapping = new ArrayList<CmisPermissionMapping>();
+        }
+        return this.mapping;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisAccessControlEntryType.java

@@ -1,6 +1,8 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyElement;
@@ -45,7 +47,7 @@ public class CmisAccessControlEntryType {
     protected String permission;
     protected boolean direct;
     @XmlAnyElement(lax = true)
-    protected Object any;
+    protected List<Object> any;
 
     /**
      * Gets the value of the principal property.
@@ -114,25 +116,30 @@ public class CmisAccessControlEntryType {
     /**
      * Gets the value of the any property.
      * 
-     * @return
-     *     possible object is
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     *     
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
      *     {@link Object }
      *     
+     * 
      */
-    public Object getAny() {
-        return any;
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
         }
-
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
+        return this.any;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisAccessControlListType.java

@@ -1,6 +1,8 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyElement;
@@ -18,7 +20,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="permission" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlEntryType"/>
+ *         <element name="permission" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlEntryType" maxOccurs="unbounded"/>
  *         <any/>
  *       </sequence>
  *     </restriction>
@@ -36,56 +38,66 @@ import javax.xml.bind.annotation.XmlType;
 public class CmisAccessControlListType {
 
     @XmlElement(required = true)
-    protected CmisAccessControlEntryType permission;
+    protected List<CmisAccessControlEntryType> permission;
     @XmlAnyElement(lax = true)
-    protected Object any;
+    protected List<Object> any;
 
     /**
      * Gets the value of the permission property.
      * 
-     * @return
-     *     possible object is
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the permission property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPermission().add(newItem);
+     * </pre>
+     *     
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
      *     {@link CmisAccessControlEntryType }
      *     
+     * 
      */
-    public CmisAccessControlEntryType getPermission() {
-        return permission;
+    public List<CmisAccessControlEntryType> getPermission() {
+        if (permission == null) {
+            permission = new ArrayList<CmisAccessControlEntryType>();
         }
-
-    /**
-     * Sets the value of the permission property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CmisAccessControlEntryType }
-     *     
-     */
-    public void setPermission(CmisAccessControlEntryType value) {
-        this.permission = value;
+        return this.permission;
     }
 
     /**
      * Gets the value of the any property.
      * 
-     * @return
-     *     possible object is
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     *     
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
      *     {@link Object }
      *     
+     * 
      */
-    public Object getAny() {
-        return any;
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
         }
-
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
+        return this.any;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisAccessControlPrincipalType.java

@@ -1,6 +1,8 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyElement;
@@ -38,7 +40,7 @@ public class CmisAccessControlPrincipalType {
     @XmlElement(required = true)
     protected String principalId;
     @XmlAnyElement(lax = true)
-    protected Object any;
+    protected List<Object> any;
 
     /**
      * Gets the value of the principalId property.
@@ -67,25 +69,30 @@ public class CmisAccessControlPrincipalType {
     /**
      * Gets the value of the any property.
      * 
-     * @return
-     *     possible object is
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     *     
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
      *     {@link Object }
      *     
+     * 
      */
-    public Object getAny() {
-        return any;
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
         }
-
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
+        return this.any;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisAllowableActionsType.java

@@ -24,27 +24,24 @@ import org.w3c.dom.Element;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="parentId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="parentUrl" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="canDelete" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canDeleteObject" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canUpdateProperties" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canGetProperties" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canGetRelationships" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canGetParents" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canGetObjectParents" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canGetFolderParent" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canGetDescendants" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canMove" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canDeleteVersion" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canDeleteContent" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canCheckout" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canCancelCheckout" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canCheckin" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canSetContent" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canMoveObject" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canDeleteContentStream" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canCheckOut" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canCancelCheckOut" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canCheckIn" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canSetContentStream" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canGetAllVersions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canAddToFolder" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canRemoveFromFolder" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canViewContent" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="canAddPolicy" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canAddObjectToFolder" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canRemoveObjectFromFolder" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canGetContentStream" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canApplyPolicy" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canGetAppliedPolicies" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canRemovePolicy" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canGetChildren" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
@@ -53,6 +50,9 @@ import org.w3c.dom.Element;
  *         <element name="canCreateRelationship" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canCreatePolicy" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="canDeleteTree" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canGetRenditions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canGetACL" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="canApplyACL" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <any/>
  *       </sequence>
  *       <attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
@@ -65,27 +65,24 @@ import org.w3c.dom.Element;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisAllowableActionsType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "parentId",
-    "parentUrl",
-    "canDelete",
+    "canDeleteObject",
     "canUpdateProperties",
     "canGetProperties",
     "canGetRelationships",
-    "canGetParents",
+    "canGetObjectParents",
     "canGetFolderParent",
     "canGetDescendants",
-    "canMove",
-    "canDeleteVersion",
-    "canDeleteContent",
-    "canCheckout",
-    "canCancelCheckout",
-    "canCheckin",
-    "canSetContent",
+    "canMoveObject",
+    "canDeleteContentStream",
+    "canCheckOut",
+    "canCancelCheckOut",
+    "canCheckIn",
+    "canSetContentStream",
     "canGetAllVersions",
-    "canAddToFolder",
-    "canRemoveFromFolder",
-    "canViewContent",
-    "canAddPolicy",
+    "canAddObjectToFolder",
+    "canRemoveObjectFromFolder",
+    "canGetContentStream",
+    "canApplyPolicy",
     "canGetAppliedPolicies",
     "canRemovePolicy",
     "canGetChildren",
@@ -94,31 +91,31 @@ import org.w3c.dom.Element;
     "canCreateRelationship",
     "canCreatePolicy",
     "canDeleteTree",
+    "canGetRenditions",
+    "canGetACL",
+    "canApplyACL",
     "any"
 })
 public class CmisAllowableActionsType {
 
-    protected String parentId;
-    protected String parentUrl;
-    protected Boolean canDelete;
+    protected Boolean canDeleteObject;
     protected Boolean canUpdateProperties;
     protected Boolean canGetProperties;
     protected Boolean canGetRelationships;
-    protected Boolean canGetParents;
+    protected Boolean canGetObjectParents;
     protected Boolean canGetFolderParent;
     protected Boolean canGetDescendants;
-    protected Boolean canMove;
-    protected Boolean canDeleteVersion;
-    protected Boolean canDeleteContent;
-    protected Boolean canCheckout;
-    protected Boolean canCancelCheckout;
-    protected Boolean canCheckin;
-    protected Boolean canSetContent;
+    protected Boolean canMoveObject;
+    protected Boolean canDeleteContentStream;
+    protected Boolean canCheckOut;
+    protected Boolean canCancelCheckOut;
+    protected Boolean canCheckIn;
+    protected Boolean canSetContentStream;
     protected Boolean canGetAllVersions;
-    protected Boolean canAddToFolder;
-    protected Boolean canRemoveFromFolder;
-    protected Boolean canViewContent;
-    protected Boolean canAddPolicy;
+    protected Boolean canAddObjectToFolder;
+    protected Boolean canRemoveObjectFromFolder;
+    protected Boolean canGetContentStream;
+    protected Boolean canApplyPolicy;
     protected Boolean canGetAppliedPolicies;
     protected Boolean canRemovePolicy;
     protected Boolean canGetChildren;
@@ -127,81 +124,36 @@ public class CmisAllowableActionsType {
     protected Boolean canCreateRelationship;
     protected Boolean canCreatePolicy;
     protected Boolean canDeleteTree;
+    protected Boolean canGetRenditions;
+    protected Boolean canGetACL;
+    protected Boolean canApplyACL;
     @XmlAnyElement(lax = true)
     protected List<Object> any;
     @XmlAnyAttribute
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
-     * Gets the value of the parentId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getParentId() {
-        return parentId;
-    }
-
-    /**
-     * Sets the value of the parentId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setParentId(String value) {
-        this.parentId = value;
-    }
-
-    /**
-     * Gets the value of the parentUrl property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getParentUrl() {
-        return parentUrl;
-    }
-
-    /**
-     * Sets the value of the parentUrl property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setParentUrl(String value) {
-        this.parentUrl = value;
-    }
-
-    /**
-     * Gets the value of the canDelete property.
+     * Gets the value of the canDeleteObject property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanDelete() {
-        return canDelete;
+    public Boolean isCanDeleteObject() {
+        return canDeleteObject;
     }
 
     /**
-     * Sets the value of the canDelete property.
+     * Sets the value of the canDeleteObject property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanDelete(Boolean value) {
-        this.canDelete = value;
+    public void setCanDeleteObject(Boolean value) {
+        this.canDeleteObject = value;
     }
 
     /**
@@ -277,27 +229,27 @@ public class CmisAllowableActionsType {
     }
 
     /**
-     * Gets the value of the canGetParents property.
+     * Gets the value of the canGetObjectParents property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanGetParents() {
-        return canGetParents;
+    public Boolean isCanGetObjectParents() {
+        return canGetObjectParents;
     }
 
     /**
-     * Sets the value of the canGetParents property.
+     * Sets the value of the canGetObjectParents property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanGetParents(Boolean value) {
-        this.canGetParents = value;
+    public void setCanGetObjectParents(Boolean value) {
+        this.canGetObjectParents = value;
     }
 
     /**
@@ -349,171 +301,147 @@ public class CmisAllowableActionsType {
     }
 
     /**
-     * Gets the value of the canMove property.
+     * Gets the value of the canMoveObject property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanMove() {
-        return canMove;
+    public Boolean isCanMoveObject() {
+        return canMoveObject;
     }
 
     /**
-     * Sets the value of the canMove property.
+     * Sets the value of the canMoveObject property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanMove(Boolean value) {
-        this.canMove = value;
+    public void setCanMoveObject(Boolean value) {
+        this.canMoveObject = value;
     }
 
     /**
-     * Gets the value of the canDeleteVersion property.
+     * Gets the value of the canDeleteContentStream property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanDeleteVersion() {
-        return canDeleteVersion;
+    public Boolean isCanDeleteContentStream() {
+        return canDeleteContentStream;
     }
 
     /**
-     * Sets the value of the canDeleteVersion property.
+     * Sets the value of the canDeleteContentStream property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanDeleteVersion(Boolean value) {
-        this.canDeleteVersion = value;
+    public void setCanDeleteContentStream(Boolean value) {
+        this.canDeleteContentStream = value;
     }
 
     /**
-     * Gets the value of the canDeleteContent property.
+     * Gets the value of the canCheckOut property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanDeleteContent() {
-        return canDeleteContent;
+    public Boolean isCanCheckOut() {
+        return canCheckOut;
     }
 
     /**
-     * Sets the value of the canDeleteContent property.
+     * Sets the value of the canCheckOut property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanDeleteContent(Boolean value) {
-        this.canDeleteContent = value;
+    public void setCanCheckOut(Boolean value) {
+        this.canCheckOut = value;
     }
 
     /**
-     * Gets the value of the canCheckout property.
+     * Gets the value of the canCancelCheckOut property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanCheckout() {
-        return canCheckout;
+    public Boolean isCanCancelCheckOut() {
+        return canCancelCheckOut;
     }
 
     /**
-     * Sets the value of the canCheckout property.
+     * Sets the value of the canCancelCheckOut property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanCheckout(Boolean value) {
-        this.canCheckout = value;
+    public void setCanCancelCheckOut(Boolean value) {
+        this.canCancelCheckOut = value;
     }
 
     /**
-     * Gets the value of the canCancelCheckout property.
+     * Gets the value of the canCheckIn property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanCancelCheckout() {
-        return canCancelCheckout;
+    public Boolean isCanCheckIn() {
+        return canCheckIn;
     }
 
     /**
-     * Sets the value of the canCancelCheckout property.
+     * Sets the value of the canCheckIn property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanCancelCheckout(Boolean value) {
-        this.canCancelCheckout = value;
+    public void setCanCheckIn(Boolean value) {
+        this.canCheckIn = value;
     }
 
     /**
-     * Gets the value of the canCheckin property.
+     * Gets the value of the canSetContentStream property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanCheckin() {
-        return canCheckin;
+    public Boolean isCanSetContentStream() {
+        return canSetContentStream;
     }
 
     /**
-     * Sets the value of the canCheckin property.
+     * Sets the value of the canSetContentStream property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanCheckin(Boolean value) {
-        this.canCheckin = value;
-    }
-
-    /**
-     * Gets the value of the canSetContent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isCanSetContent() {
-        return canSetContent;
-    }
-
-    /**
-     * Sets the value of the canSetContent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setCanSetContent(Boolean value) {
-        this.canSetContent = value;
+    public void setCanSetContentStream(Boolean value) {
+        this.canSetContentStream = value;
     }
 
     /**
@@ -541,99 +469,99 @@ public class CmisAllowableActionsType {
     }
 
     /**
-     * Gets the value of the canAddToFolder property.
+     * Gets the value of the canAddObjectToFolder property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanAddToFolder() {
-        return canAddToFolder;
+    public Boolean isCanAddObjectToFolder() {
+        return canAddObjectToFolder;
     }
 
     /**
-     * Sets the value of the canAddToFolder property.
+     * Sets the value of the canAddObjectToFolder property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanAddToFolder(Boolean value) {
-        this.canAddToFolder = value;
+    public void setCanAddObjectToFolder(Boolean value) {
+        this.canAddObjectToFolder = value;
     }
 
     /**
-     * Gets the value of the canRemoveFromFolder property.
+     * Gets the value of the canRemoveObjectFromFolder property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanRemoveFromFolder() {
-        return canRemoveFromFolder;
+    public Boolean isCanRemoveObjectFromFolder() {
+        return canRemoveObjectFromFolder;
     }
 
     /**
-     * Sets the value of the canRemoveFromFolder property.
+     * Sets the value of the canRemoveObjectFromFolder property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanRemoveFromFolder(Boolean value) {
-        this.canRemoveFromFolder = value;
+    public void setCanRemoveObjectFromFolder(Boolean value) {
+        this.canRemoveObjectFromFolder = value;
     }
 
     /**
-     * Gets the value of the canViewContent property.
+     * Gets the value of the canGetContentStream property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanViewContent() {
-        return canViewContent;
+    public Boolean isCanGetContentStream() {
+        return canGetContentStream;
     }
 
     /**
-     * Sets the value of the canViewContent property.
+     * Sets the value of the canGetContentStream property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanViewContent(Boolean value) {
-        this.canViewContent = value;
+    public void setCanGetContentStream(Boolean value) {
+        this.canGetContentStream = value;
     }
 
     /**
-     * Gets the value of the canAddPolicy property.
+     * Gets the value of the canApplyPolicy property.
      * 
      * @return
      *     possible object is
      *     {@link Boolean }
      *     
      */
-    public Boolean isCanAddPolicy() {
-        return canAddPolicy;
+    public Boolean isCanApplyPolicy() {
+        return canApplyPolicy;
     }
 
     /**
-     * Sets the value of the canAddPolicy property.
+     * Sets the value of the canApplyPolicy property.
      * 
      * @param value
      *     allowed object is
      *     {@link Boolean }
      *     
      */
-    public void setCanAddPolicy(Boolean value) {
-        this.canAddPolicy = value;
+    public void setCanApplyPolicy(Boolean value) {
+        this.canApplyPolicy = value;
     }
 
     /**
@@ -828,6 +756,78 @@ public class CmisAllowableActionsType {
         this.canDeleteTree = value;
     }
 
+    /**
+     * Gets the value of the canGetRenditions property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isCanGetRenditions() {
+        return canGetRenditions;
+    }
+
+    /**
+     * Sets the value of the canGetRenditions property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setCanGetRenditions(Boolean value) {
+        this.canGetRenditions = value;
+    }
+
+    /**
+     * Gets the value of the canGetACL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isCanGetACL() {
+        return canGetACL;
+    }
+
+    /**
+     * Sets the value of the canGetACL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setCanGetACL(Boolean value) {
+        this.canGetACL = value;
+    }
+
+    /**
+     * Gets the value of the canApplyACL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isCanApplyACL() {
+        return canApplyACL;
+    }
+
+    /**
+     * Sets the value of the canApplyACL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setCanApplyACL(Boolean value) {
+        this.canApplyACL = value;
+    }
+
     /**
      * Gets the value of the any property.
      * 
@@ -846,8 +846,8 @@ public class CmisAllowableActionsType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CmisAnyXml.java

@@ -63,8 +63,8 @@ public class CmisAnyXml {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CmisChangeEventType.java

@@ -1,6 +1,8 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyElement;
@@ -8,15 +10,16 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
+import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for cmisChangedObjectType complex type.
+ * <p>Java class for cmisChangeEventType complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChangedObjectType">
+ * &lt;complexType name="cmisChangeEventType">
  *   &lt;complexContent>
  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       &lt;sequence>
@@ -32,12 +35,12 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChangedObjectType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChangeEventType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "changeType",
     "changeTime",
     "any"
 })
-public class CmisChangedObjectType {
+public class CmisChangeEventType {
 
     @XmlElement(required = true)
     protected EnumTypeOfChanges changeType;
@@ -45,7 +48,7 @@ public class CmisChangedObjectType {
     @XmlSchemaType(name = "dateTime")
     protected XMLGregorianCalendar changeTime;
     @XmlAnyElement(lax = true)
-    protected Object any;
+    protected List<Object> any;
 
     /**
      * Gets the value of the changeType property.
@@ -98,25 +101,31 @@ public class CmisChangedObjectType {
     /**
      * Gets the value of the any property.
      * 
-     * @return
-     *     possible object is
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Element }
      * {@link Object }
      * 
+     * 
      */
-    public Object getAny() {
-        return any;
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
         }
-
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
+        return this.any;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisChoice.java

@@ -0,0 +1,98 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+
+/**
+ * <p>Java class for cmisChoice complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisChoice">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
+ *       &lt;attribute name="displayName" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisChoice", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlSeeAlso({
+    CmisChoiceId.class,
+    CmisChoiceDateTime.class,
+    CmisChoiceDecimal.class,
+    CmisChoiceBoolean.class,
+    CmisChoiceXml.class,
+    CmisChoiceHtml.class,
+    CmisChoiceXhtml.class,
+    CmisChoiceUri.class,
+    CmisChoiceInteger.class,
+    CmisChoiceString.class
+})
+public class CmisChoice {
+
+    @XmlAttribute(required = true)
+    @XmlSchemaType(name = "anySimpleType")
+    protected String displayName;
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the displayName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * Sets the value of the displayName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDisplayName(String value) {
+        this.displayName = value;
+    }
+
+    /**
+     * Gets a map that contains attributes that aren't bound to any typed property on this class.
+     * 
+     * <p>
+     * the map is keyed by the name of the attribute and 
+     * the value is the string value of the attribute.
+     * 
+     * the map returned by this method is live, and you can add new attribute
+     * by updating the map directly. Because of this design, there's no setter.
+     * 
+     * 
+     * @return
+     *     always non-null
+     */
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceBoolean.java

@@ -10,14 +10,14 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for cmisChoiceBooleanType complex type.
+ * <p>Java class for cmisChoiceBoolean complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChoiceBooleanType">
+ * &lt;complexType name="cmisChoiceBoolean">
  *   &lt;complexContent>
- *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceType">
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
  *       &lt;sequence>
  *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}boolean" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
@@ -29,11 +29,11 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceBooleanType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChoiceBoolean", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "value"
 })
-public class CmisChoiceBooleanType
-    extends CmisChoiceType
+public class CmisChoiceBoolean
+    extends CmisChoice
 {
 
     @XmlElement(type = Boolean.class)

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceDateTime.java

@@ -11,14 +11,14 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 
 /**
- * <p>Java class for cmisChoiceDateTimeType complex type.
+ * <p>Java class for cmisChoiceDateTime complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChoiceDateTimeType">
+ * &lt;complexType name="cmisChoiceDateTime">
  *   &lt;complexContent>
- *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceType">
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
  *       &lt;sequence>
  *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}dateTime" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
@@ -30,11 +30,11 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceDateTimeType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChoiceDateTime", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "value"
 })
-public class CmisChoiceDateTimeType
-    extends CmisChoiceType
+public class CmisChoiceDateTime
+    extends CmisChoice
 {
 
     @XmlSchemaType(name = "dateTime")

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceDecimal.java

@@ -10,14 +10,14 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for cmisChoiceDecimalType complex type.
+ * <p>Java class for cmisChoiceDecimal complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChoiceDecimalType">
+ * &lt;complexType name="cmisChoiceDecimal">
  *   &lt;complexContent>
- *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceType">
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
  *       &lt;sequence>
  *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}decimal" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
@@ -29,11 +29,11 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceDecimalType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChoiceDecimal", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "value"
 })
-public class CmisChoiceDecimalType
-    extends CmisChoiceType
+public class CmisChoiceDecimal
+    extends CmisChoice
 {
 
     protected List<BigDecimal> value;

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceHtml.java

@@ -11,14 +11,14 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for cmisChoiceHtmlType complex type.
+ * <p>Java class for cmisChoiceHtml complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChoiceHtmlType">
+ * &lt;complexType name="cmisChoiceHtml">
  *   &lt;complexContent>
- *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceType">
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
  *       &lt;sequence>
  *         &lt;element name="value" maxOccurs="unbounded" minOccurs="0">
  *           &lt;complexType>
@@ -40,14 +40,14 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceHtmlType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChoiceHtml", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "value"
 })
-public class CmisChoiceHtmlType
-    extends CmisChoiceType
+public class CmisChoiceHtml
+    extends CmisChoice
 {
 
-    protected List<CmisChoiceHtmlType.Value> value;
+    protected List<CmisChoiceHtml.Value> value;
 
     /**
      * Gets the value of the value property.
@@ -67,13 +67,13 @@ public class CmisChoiceHtmlType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceHtmlType.Value }
+     * {@link CmisChoiceHtml.Value }
      * 
      * 
      */
-    public List<CmisChoiceHtmlType.Value> getValue() {
+    public List<CmisChoiceHtml.Value> getValue() {
         if (value == null) {
-            value = new ArrayList<CmisChoiceHtmlType.Value>();
+            value = new ArrayList<CmisChoiceHtml.Value>();
         }
         return this.value;
     }
@@ -125,8 +125,8 @@ public class CmisChoiceHtmlType
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
-         * {@link Object }
          * {@link Element }
+         * {@link Object }
          * 
          * 
          */

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceId.java

@@ -5,21 +5,24 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for cmisChoiceStringType complex type.
+ * <p>Java class for cmisChoiceId complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChoiceStringType">
+ * &lt;complexType name="cmisChoiceId">
  *   &lt;complexContent>
- *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceType">
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
  *       &lt;sequence>
  *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
+ *       &lt;attribute ref="{http://docs.oasis-open.org/ns/cmis/core/200901}href"/>
  *     &lt;/extension>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -28,14 +31,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceStringType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChoiceId", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "value"
 })
-public class CmisChoiceStringType
-    extends CmisChoiceType
+public class CmisChoiceId
+    extends CmisChoice
 {
 
     protected List<String> value;
+    @XmlAttribute(namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+    @XmlSchemaType(name = "anyURI")
+    protected String href;
 
     /**
      * Gets the value of the value property.
@@ -66,4 +72,28 @@ public class CmisChoiceStringType
         return this.value;
     }
 
+    /**
+     * Gets the value of the href property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getHref() {
+        return href;
+    }
+
+    /**
+     * Sets the value of the href property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHref(String value) {
+        this.href = value;
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceInteger.java

@@ -10,14 +10,14 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for cmisChoiceIntegerType complex type.
+ * <p>Java class for cmisChoiceInteger complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChoiceIntegerType">
+ * &lt;complexType name="cmisChoiceInteger">
  *   &lt;complexContent>
- *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceType">
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
  *       &lt;sequence>
  *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}integer" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
@@ -29,11 +29,11 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceIntegerType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChoiceInteger", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "value"
 })
-public class CmisChoiceIntegerType
-    extends CmisChoiceType
+public class CmisChoiceInteger
+    extends CmisChoice
 {
 
     protected List<BigInteger> value;

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceString.java

@@ -9,14 +9,14 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for cmisChoiceIdType complex type.
+ * <p>Java class for cmisChoiceString complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChoiceIdType">
+ * &lt;complexType name="cmisChoiceString">
  *   &lt;complexContent>
- *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceType">
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
  *       &lt;sequence>
  *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
@@ -28,11 +28,11 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceIdType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChoiceString", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "value"
 })
-public class CmisChoiceIdType
-    extends CmisChoiceType
+public class CmisChoiceString
+    extends CmisChoice
 {
 
     protected List<String> value;

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceType.java

@@ -1,144 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-
-/**
- * <p>Java class for cmisChoiceType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="cmisChoiceType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choice" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
- *       &lt;attribute ref="{http://docs.oasis-open.org/ns/cmis/core/200901}key"/>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "choice"
-})
-@XmlSeeAlso({
-    CmisChoiceXmlType.class,
-    CmisChoiceStringType.class,
-    CmisChoiceDecimalType.class,
-    CmisChoiceUriType.class,
-    CmisChoiceIntegerType.class,
-    CmisChoiceIdType.class,
-    CmisChoiceBooleanType.class,
-    CmisChoiceHtmlType.class,
-    CmisChoiceDateTimeType.class
-})
-public abstract class CmisChoiceType {
-
-    @XmlElementRef(name = "choice", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", type = JAXBElement.class)
-    protected List<JAXBElement<? extends CmisChoiceType>> choice;
-    @XmlAttribute(namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-    protected String key;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the choice property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the choice property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getChoice().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link CmisChoiceHtmlType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceBooleanType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceDecimalType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceIdType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceDateTimeType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceUriType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceXmlType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceStringType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CmisChoiceIntegerType }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<? extends CmisChoiceType>> getChoice() {
-        if (choice == null) {
-            choice = new ArrayList<JAXBElement<? extends CmisChoiceType>>();
-        }
-        return this.choice;
-    }
-
-    /**
-     * Gets the value of the key property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Sets the value of the key property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKey(String value) {
-        this.key = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceUri.java

@@ -10,14 +10,14 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for cmisChoiceUriType complex type.
+ * <p>Java class for cmisChoiceUri complex type.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
- * &lt;complexType name="cmisChoiceUriType">
+ * &lt;complexType name="cmisChoiceUri">
  *   &lt;complexContent>
- *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceType">
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
  *       &lt;sequence>
  *         &lt;element name="value" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
  *       &lt;/sequence>
@@ -29,11 +29,11 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisChoiceUriType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisChoiceUri", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "value"
 })
-public class CmisChoiceUriType
-    extends CmisChoiceType
+public class CmisChoiceUri
+    extends CmisChoice
 {
 
     @XmlSchemaType(name = "anyURI")

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceXhtml.java

@@ -0,0 +1,142 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for cmisChoiceXhtml complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisChoiceXhtml">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
+ *       &lt;sequence>
+ *         &lt;element name="value" maxOccurs="unbounded" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;any/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisChoiceXhtml", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "value"
+})
+public class CmisChoiceXhtml
+    extends CmisChoice
+{
+
+    protected List<CmisChoiceXhtml.Value> value;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the value property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getValue().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisChoiceXhtml.Value }
+     * 
+     * 
+     */
+    public List<CmisChoiceXhtml.Value> getValue() {
+        if (value == null) {
+            value = new ArrayList<CmisChoiceXhtml.Value>();
+        }
+        return this.value;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence>
+     *         &lt;any/>
+     *       &lt;/sequence>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+        "any"
+    })
+    public static class Value {
+
+        @XmlAnyElement(lax = true)
+        protected List<Object> any;
+
+        /**
+         * Gets the value of the any property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the any property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getAny().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link Element }
+         * {@link Object }
+         * 
+         * 
+         */
+        public List<Object> getAny() {
+            if (any == null) {
+                any = new ArrayList<Object>();
+            }
+            return this.any;
+        }
+
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisChoiceXml.java

@@ -0,0 +1,142 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for cmisChoiceXml complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisChoiceXml">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoice">
+ *       &lt;sequence>
+ *         &lt;element name="value" maxOccurs="unbounded" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;any/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisChoiceXml", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "value"
+})
+public class CmisChoiceXml
+    extends CmisChoice
+{
+
+    protected List<CmisChoiceXml.Value> value;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the value property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getValue().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisChoiceXml.Value }
+     * 
+     * 
+     */
+    public List<CmisChoiceXml.Value> getValue() {
+        if (value == null) {
+            value = new ArrayList<CmisChoiceXml.Value>();
+        }
+        return this.value;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence>
+     *         &lt;any/>
+     *       &lt;/sequence>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+        "any"
+    })
+    public static class Value {
+
+        @XmlAnyElement(lax = true)
+        protected List<Object> any;
+
+        /**
+         * Gets the value of the any property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the any property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getAny().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link Element }
+         * {@link Object }
+         * 
+         * 
+         */
+        public List<Object> getAny() {
+            if (any == null) {
+                any = new ArrayList<Object>();
+            }
+            return this.any;
+        }
+
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisContentStreamType.java

@@ -45,7 +45,7 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisContentStreamType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+@XmlType(name = "cmisContentStreamType", propOrder = {
     "length",
     "mimeType",
     "filename",
@@ -207,8 +207,8 @@ public class CmisContentStreamType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CmisException.java

@@ -6,14 +6,14 @@ import javax.xml.ws.WebFault;
 
 /**
  * This class was generated by Apache CXF 2.1.2
- * Wed May 20 15:06:32 EEST 2009
+ * Fri Jul 24 09:58:28 EEST 2009
  * Generated source version: 2.1.2
  * 
  */
 
 @WebFault(name = "cmisFault", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
 public class CmisException extends Exception {
-    public static final long serialVersionUID = 20090520150632L;
+    public static final long serialVersionUID = 20090724095828L;
     
     private org.alfresco.repo.cmis.ws.CmisFaultType cmisFault;
 

source/generated/org/alfresco/repo/cmis/ws/CmisObjectType.java

@@ -27,8 +27,11 @@ import org.w3c.dom.Element;
  *         <element name="properties" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertiesType" minOccurs="0"/>
  *         <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}allowableActions" minOccurs="0"/>
  *         <element name="relationship" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisObjectType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="changeObject" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChangedObjectType" minOccurs="0"/>
  *         <element name="child" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisObjectType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="changeEventInfo" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChangeEventType" minOccurs="0"/>
+ *         <element name="acl" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
+ *         <element name="exactACL" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="rendition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisRenditionType" maxOccurs="unbounded" minOccurs="0"/>
  *         <any/>
  *       </sequence>
  *       <attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
@@ -44,8 +47,11 @@ import org.w3c.dom.Element;
     "properties",
     "allowableActions",
     "relationship",
-    "changeObject",
     "child",
+    "changeEventInfo",
+    "acl",
+    "exactACL",
+    "rendition",
     "any"
 })
 public class CmisObjectType {
@@ -53,8 +59,11 @@ public class CmisObjectType {
     protected CmisPropertiesType properties;
     protected CmisAllowableActionsType allowableActions;
     protected List<CmisObjectType> relationship;
-    protected CmisChangedObjectType changeObject;
     protected List<CmisObjectType> child;
+    protected CmisChangeEventType changeEventInfo;
+    protected CmisAccessControlListType acl;
+    protected Boolean exactACL;
+    protected List<CmisRenditionType> rendition;
     @XmlAnyElement(lax = true)
     protected List<Object> any;
     @XmlAnyAttribute
@@ -137,30 +146,6 @@ public class CmisObjectType {
         return this.relationship;
     }
 
-    /**
-     * Gets the value of the changeObject property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CmisChangedObjectType }
-     *     
-     */
-    public CmisChangedObjectType getChangeObject() {
-        return changeObject;
-    }
-
-    /**
-     * Sets the value of the changeObject property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CmisChangedObjectType }
-     *     
-     */
-    public void setChangeObject(CmisChangedObjectType value) {
-        this.changeObject = value;
-    }
-
     /**
      * Gets the value of the child property.
      * 
@@ -190,6 +175,107 @@ public class CmisObjectType {
         return this.child;
     }
 
+    /**
+     * Gets the value of the changeEventInfo property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CmisChangeEventType }
+     *     
+     */
+    public CmisChangeEventType getChangeEventInfo() {
+        return changeEventInfo;
+    }
+
+    /**
+     * Sets the value of the changeEventInfo property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisChangeEventType }
+     *     
+     */
+    public void setChangeEventInfo(CmisChangeEventType value) {
+        this.changeEventInfo = value;
+    }
+
+    /**
+     * Gets the value of the acl property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CmisAccessControlListType }
+     *     
+     */
+    public CmisAccessControlListType getAcl() {
+        return acl;
+    }
+
+    /**
+     * Sets the value of the acl property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisAccessControlListType }
+     *     
+     */
+    public void setAcl(CmisAccessControlListType value) {
+        this.acl = value;
+    }
+
+    /**
+     * Gets the value of the exactACL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isExactACL() {
+        return exactACL;
+    }
+
+    /**
+     * Sets the value of the exactACL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setExactACL(Boolean value) {
+        this.exactACL = value;
+    }
+
+    /**
+     * Gets the value of the rendition property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the rendition property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRendition().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisRenditionType }
+     * 
+     * 
+     */
+    public List<CmisRenditionType> getRendition() {
+        if (rendition == null) {
+            rendition = new ArrayList<CmisRenditionType>();
+        }
+        return this.rendition;
+    }
+
     /**
      * Gets the value of the any property.
      * 
@@ -208,8 +294,8 @@ public class CmisObjectType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CmisPermissionDefinition.java

@@ -0,0 +1,127 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for cmisPermissionDefinition complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisPermissionDefinition">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="permission" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;any/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisPermissionDefinition", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "permission",
+    "description",
+    "any"
+})
+public class CmisPermissionDefinition {
+
+    @XmlElement(required = true)
+    protected String permission;
+    protected String description;
+    @XmlAnyElement(lax = true)
+    protected List<Object> any;
+
+    /**
+     * Gets the value of the permission property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPermission() {
+        return permission;
+    }
+
+    /**
+     * Sets the value of the permission property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPermission(String value) {
+        this.permission = value;
+    }
+
+    /**
+     * Gets the value of the description property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDescription(String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Element }
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisPermissionDefinitionType.java

@@ -1,186 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for cmisPermissionDefinitionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="cmisPermissionDefinitionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}language" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="aggregating" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPermissionDefinitionType" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="aggregated" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="abstract" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisPermissionDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "description",
-    "aggregating"
-})
-public class CmisPermissionDefinitionType {
-
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlSchemaType(name = "language")
-    protected List<String> description;
-    protected List<CmisPermissionDefinitionType> aggregating;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected Boolean aggregated;
-    @XmlAttribute(name = "abstract")
-    protected Boolean _abstract;
-
-    /**
-     * Gets the value of the description property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the description property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDescription().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getDescription() {
-        if (description == null) {
-            description = new ArrayList<String>();
-        }
-        return this.description;
-    }
-
-    /**
-     * Gets the value of the aggregating property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the aggregating property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAggregating().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CmisPermissionDefinitionType }
-     * 
-     * 
-     */
-    public List<CmisPermissionDefinitionType> getAggregating() {
-        if (aggregating == null) {
-            aggregating = new ArrayList<CmisPermissionDefinitionType>();
-        }
-        return this.aggregating;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the aggregated property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isAggregated() {
-        return aggregated;
-    }
-
-    /**
-     * Sets the value of the aggregated property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setAggregated(Boolean value) {
-        this.aggregated = value;
-    }
-
-    /**
-     * Gets the value of the abstract property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isAbstract() {
-        return _abstract;
-    }
-
-    /**
-     * Sets the value of the abstract property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setAbstract(Boolean value) {
-        this._abstract = value;
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/CmisPermissionMapping.java

@@ -0,0 +1,119 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for cmisPermissionMapping complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisPermissionMapping">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="key" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumAllowableActionsKey"/>
+ *         &lt;element name="permission" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;any/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisPermissionMapping", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "key",
+    "permission",
+    "any"
+})
+public class CmisPermissionMapping {
+
+    @XmlElement(required = true)
+    protected EnumAllowableActionsKey key;
+    @XmlElement(required = true)
+    protected String permission;
+    @XmlAnyElement(lax = true)
+    protected Object any;
+
+    /**
+     * Gets the value of the key property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnumAllowableActionsKey }
+     *     
+     */
+    public EnumAllowableActionsKey getKey() {
+        return key;
+    }
+
+    /**
+     * Sets the value of the key property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnumAllowableActionsKey }
+     *     
+     */
+    public void setKey(EnumAllowableActionsKey value) {
+        this.key = value;
+    }
+
+    /**
+     * Gets the value of the permission property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPermission() {
+        return permission;
+    }
+
+    /**
+     * Sets the value of the permission property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPermission(String value) {
+        this.permission = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getAny() {
+        return any;
+    }
+
+    /**
+     * Sets the value of the any property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setAny(Object value) {
+        this.any = value;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisPropertiesType.java

@@ -27,15 +27,16 @@ import org.w3c.dom.Element;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyBoolean"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyId"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyInteger"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyDateTime"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyDecimal"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyHtml"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyString"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyUri"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyXml"/>
+ *           <element name="propertyBoolean" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyBoolean"/>
+ *           <element name="propertyId" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyId"/>
+ *           <element name="propertyInteger" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyInteger"/>
+ *           <element name="propertyDateTime" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDateTime"/>
+ *           <element name="propertyDecimal" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDecimal"/>
+ *           <element name="propertyHtml" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyHtml"/>
+ *           <element name="propertyXhtml" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyXhtml"/>
+ *           <element name="propertyString" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyString"/>
+ *           <element name="propertyUri" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyUri"/>
+ *           <element name="propertyXml" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyXml"/>
  *         </choice>
  *         <any/>
  *       </sequence>
@@ -55,15 +56,16 @@ import org.w3c.dom.Element;
 public class CmisPropertiesType {
 
     @XmlElements({
-        @XmlElement(name = "propertyBoolean", type = CmisPropertyBoolean.class, nillable = true),
-        @XmlElement(name = "propertyDecimal", type = CmisPropertyDecimal.class, nillable = true),
-        @XmlElement(name = "propertyXml", type = CmisPropertyXml.class, nillable = true),
-        @XmlElement(name = "propertyDateTime", type = CmisPropertyDateTime.class, nillable = true),
+        @XmlElement(name = "propertyXhtml", type = CmisPropertyXhtml.class, nillable = true),
+        @XmlElement(name = "propertyHtml", type = CmisPropertyHtml.class, nillable = true),
         @XmlElement(name = "propertyInteger", type = CmisPropertyInteger.class, nillable = true),
         @XmlElement(name = "propertyString", type = CmisPropertyString.class, nillable = true),
-        @XmlElement(name = "propertyHtml", type = CmisPropertyHtml.class, nillable = true),
         @XmlElement(name = "propertyUri", type = CmisPropertyUri.class, nillable = true),
-        @XmlElement(name = "propertyId", type = CmisPropertyId.class, nillable = true)
+        @XmlElement(name = "propertyId", type = CmisPropertyId.class, nillable = true),
+        @XmlElement(name = "propertyDateTime", type = CmisPropertyDateTime.class, nillable = true),
+        @XmlElement(name = "propertyXml", type = CmisPropertyXml.class, nillable = true),
+        @XmlElement(name = "propertyDecimal", type = CmisPropertyDecimal.class, nillable = true),
+        @XmlElement(name = "propertyBoolean", type = CmisPropertyBoolean.class, nillable = true)
     })
     protected List<CmisProperty> property;
     @XmlAnyElement(lax = true)
@@ -89,15 +91,16 @@ public class CmisPropertiesType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link CmisPropertyBoolean }
-     * {@link CmisPropertyDecimal }
-     * {@link CmisPropertyXml }
-     * {@link CmisPropertyDateTime }
+     * {@link CmisPropertyXhtml }
+     * {@link CmisPropertyHtml }
      * {@link CmisPropertyInteger }
      * {@link CmisPropertyString }
-     * {@link CmisPropertyHtml }
      * {@link CmisPropertyUri }
      * {@link CmisPropertyId }
+     * {@link CmisPropertyDateTime }
+     * {@link CmisPropertyXml }
+     * {@link CmisPropertyDecimal }
+     * {@link CmisPropertyBoolean }
      * 
      * 
      */
@@ -126,8 +129,8 @@ public class CmisPropertiesType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CmisProperty.java

@@ -7,6 +7,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
@@ -22,7 +23,9 @@ import javax.xml.namespace.QName;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
- *       <attribute ref="{http://docs.oasis-open.org/ns/cmis/core/200901}name use="required""/>
+ *       <attribute name="pdid" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *       <attribute name="localname" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *       <attribute name="displayname" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
  *     </restriction>
  *   </complexContent>
  * </complexType>
@@ -33,45 +36,101 @@ import javax.xml.namespace.QName;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisProperty", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
 @XmlSeeAlso({
-    CmisPropertyXml.class,
-    CmisPropertyDateTime.class,
-    CmisPropertyString.class,
-    CmisPropertyInteger.class,
-    CmisPropertyBoolean.class,
-    CmisPropertyId.class,
-    CmisPropertyUri.class,
     CmisPropertyDecimal.class,
-    CmisPropertyHtml.class
+    CmisPropertyInteger.class,
+    CmisPropertyXhtml.class,
+    CmisPropertyDateTime.class,
+    CmisPropertyUri.class,
+    CmisPropertyXml.class,
+    CmisPropertyHtml.class,
+    CmisPropertyBoolean.class,
+    CmisPropertyString.class,
+    CmisPropertyId.class
 })
 public class CmisProperty {
 
-    @XmlAttribute(namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", required = true)
-    protected String name;
+    @XmlAttribute(required = true)
+    @XmlSchemaType(name = "anySimpleType")
+    protected String pdid;
+    @XmlAttribute
+    @XmlSchemaType(name = "anySimpleType")
+    protected String localname;
+    @XmlAttribute
+    @XmlSchemaType(name = "anySimpleType")
+    protected String displayname;
     @XmlAnyAttribute
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
-     * Gets the value of the name property.
+     * Gets the value of the pdid property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getName() {
-        return name;
+    public String getPdid() {
+        return pdid;
     }
 
     /**
-     * Sets the value of the name property.
+     * Sets the value of the pdid property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setName(String value) {
-        this.name = value;
+    public void setPdid(String value) {
+        this.pdid = value;
+    }
+
+    /**
+     * Gets the value of the localname property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLocalname() {
+        return localname;
+    }
+
+    /**
+     * Sets the value of the localname property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLocalname(String value) {
+        this.localname = value;
+    }
+
+    /**
+     * Gets the value of the displayname property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDisplayname() {
+        return displayname;
+    }
+
+    /**
+     * Sets the value of the displayname property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDisplayname(String value) {
+        this.displayname = value;
     }
 
     /**

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyBooleanDefinitionType.java

@@ -18,7 +18,8 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceBooleanType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyBoolean" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceBoolean" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -29,41 +30,67 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyBooleanDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "defaultValue"
+    "defaultValue",
+    "choice"
 })
 public class CmisPropertyBooleanDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceBooleanType> defaultValue;
+    protected CmisPropertyBoolean defaultValue;
+    protected List<CmisChoiceBoolean> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyBoolean }
+     *     
+     */
+    public CmisPropertyBoolean getDefaultValue() {
+        return defaultValue;
+    }
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyBoolean }
+     *     
+     */
+    public void setDefaultValue(CmisPropertyBoolean value) {
+        this.defaultValue = value;
+    }
+
+    /**
+     * Gets the value of the choice property.
+     * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getDefaultValue().add(newItem);
+     *    getChoice().add(newItem);
      * </pre>
      * 
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceBooleanType }
+     * {@link CmisChoiceBoolean }
      * 
      * 
      */
-    public List<CmisChoiceBooleanType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceBooleanType>();
+    public List<CmisChoiceBoolean> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceBoolean>();
         }
-        return this.defaultValue;
+        return this.choice;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyDateTimeDefinitionType.java

@@ -18,7 +18,8 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceDateTimeType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDateTime" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceDateTime" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -29,41 +30,67 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyDateTimeDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "defaultValue"
+    "defaultValue",
+    "choice"
 })
 public class CmisPropertyDateTimeDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceDateTimeType> defaultValue;
+    protected CmisPropertyDateTime defaultValue;
+    protected List<CmisChoiceDateTime> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyDateTime }
+     *     
+     */
+    public CmisPropertyDateTime getDefaultValue() {
+        return defaultValue;
+    }
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyDateTime }
+     *     
+     */
+    public void setDefaultValue(CmisPropertyDateTime value) {
+        this.defaultValue = value;
+    }
+
+    /**
+     * Gets the value of the choice property.
+     * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getDefaultValue().add(newItem);
+     *    getChoice().add(newItem);
      * </pre>
      * 
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceDateTimeType }
+     * {@link CmisChoiceDateTime }
      * 
      * 
      */
-    public List<CmisChoiceDateTimeType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceDateTimeType>();
+    public List<CmisChoiceDateTime> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceDateTime>();
         }
-        return this.defaultValue;
+        return this.choice;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyDecimalDefinitionType.java

@@ -1,6 +1,7 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,8 +20,11 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceDecimalType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDecimal" minOccurs="0"/>
+ *         <element name="maxValue" type="{http://www.w3.org/2001/XMLSchema}decimal" minOccurs="0"/>
+ *         <element name="minValue" type="{http://www.w3.org/2001/XMLSchema}decimal" minOccurs="0"/>
  *         <element name="precision" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumDecimalPrecision" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceDecimal" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -32,42 +36,91 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyDecimalDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "defaultValue",
-    "precision"
+    "maxValue",
+    "minValue",
+    "precision",
+    "choice"
 })
 public class CmisPropertyDecimalDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceDecimalType> defaultValue;
+    protected CmisPropertyDecimal defaultValue;
+    protected BigDecimal maxValue;
+    protected BigDecimal minValue;
     protected BigInteger precision;
+    protected List<CmisChoiceDecimal> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDefaultValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceDecimalType }
-     * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyDecimal }
      *     
      */
-    public List<CmisChoiceDecimalType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceDecimalType>();
+    public CmisPropertyDecimal getDefaultValue() {
+        return defaultValue;
     }
-        return this.defaultValue;
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyDecimal }
+     *     
+     */
+    public void setDefaultValue(CmisPropertyDecimal value) {
+        this.defaultValue = value;
+    }
+
+    /**
+     * Gets the value of the maxValue property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     * 
+     */
+    public BigDecimal getMaxValue() {
+        return maxValue;
+    }
+
+    /**
+     * Sets the value of the maxValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     * 
+     */
+    public void setMaxValue(BigDecimal value) {
+        this.maxValue = value;
+    }
+
+    /**
+     * Gets the value of the minValue property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigDecimal }
+     * 
+     */
+    public BigDecimal getMinValue() {
+        return minValue;
+        }
+
+    /**
+     * Sets the value of the minValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigDecimal }
+     *     
+     */
+    public void setMinValue(BigDecimal value) {
+        this.minValue = value;
     }
 
     /**
@@ -94,4 +147,33 @@ public class CmisPropertyDecimalDefinitionType
         this.precision = value;
     }
 
+    /**
+     * Gets the value of the choice property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getChoice().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisChoiceDecimal }
+     * 
+     * 
+     */
+    public List<CmisChoiceDecimal> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceDecimal>();
+        }
+        return this.choice;
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyDefinitionType.java

@@ -10,7 +10,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
 import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
@@ -27,10 +27,11 @@ import org.w3c.dom.Element;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="package" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="displayName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="localName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="localNamespace" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="queryName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="propertyType" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumPropertyType"/>
  *         <element name="cardinality" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCardinality"/>
@@ -39,17 +40,6 @@ import org.w3c.dom.Element;
  *         <element name="required" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="queryable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="orderable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceBoolean"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceDateTime"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceDecimal"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceHtml"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceId"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceInteger"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceString"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceUri"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}choiceXml"/>
- *         </choice>
  *         <element name="openChoice" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <any/>
  *       </sequence>
@@ -63,10 +53,11 @@ import org.w3c.dom.Element;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "name",
     "id",
-    "_package",
+    "localName",
+    "localNamespace",
     "displayName",
+    "queryName",
     "description",
     "propertyType",
     "cardinality",
@@ -75,31 +66,31 @@ import org.w3c.dom.Element;
     "required",
     "queryable",
     "orderable",
-    "choice",
     "openChoice",
     "any"
 })
 @XmlSeeAlso({
+    CmisPropertyXhtmlDefinitionType.class,
     CmisPropertyHtmlDefinitionType.class,
-    CmisPropertyIntegerDefinitionType.class,
-    CmisPropertyBooleanDefinitionType.class,
-    CmisPropertyStringDefinitionType.class,
-    CmisPropertyDateTimeDefinitionType.class,
     CmisPropertyUriDefinitionType.class,
-    CmisPropertyDecimalDefinitionType.class,
     CmisPropertyIdDefinitionType.class,
-    CmisPropertyXmlDefinitionType.class
+    CmisPropertyBooleanDefinitionType.class,
+    CmisPropertyXmlDefinitionType.class,
+    CmisPropertyIntegerDefinitionType.class,
+    CmisPropertyDateTimeDefinitionType.class,
+    CmisPropertyDecimalDefinitionType.class,
+    CmisPropertyStringDefinitionType.class
 })
 public class CmisPropertyDefinitionType {
 
-    @XmlElement(required = true)
-    protected String name;
     @XmlElement(required = true)
     protected String id;
-    @XmlElement(name = "package", required = true)
-    protected String _package;
     @XmlElement(required = true)
+    protected String localName;
+    @XmlSchemaType(name = "anyURI")
+    protected String localNamespace;
     protected String displayName;
+    protected String queryName;
     protected String description;
     @XmlElement(required = true)
     protected EnumPropertyType propertyType;
@@ -111,48 +102,12 @@ public class CmisPropertyDefinitionType {
     protected boolean required;
     protected boolean queryable;
     protected boolean orderable;
-    @XmlElements({
-        @XmlElement(name = "choiceId", type = CmisChoiceIdType.class),
-        @XmlElement(name = "choiceDateTime", type = CmisChoiceDateTimeType.class),
-        @XmlElement(name = "choiceString", type = CmisChoiceStringType.class),
-        @XmlElement(name = "choiceInteger", type = CmisChoiceIntegerType.class),
-        @XmlElement(name = "choiceDecimal", type = CmisChoiceDecimalType.class),
-        @XmlElement(name = "choiceXml", type = CmisChoiceXmlType.class),
-        @XmlElement(name = "choiceHtml", type = CmisChoiceHtmlType.class),
-        @XmlElement(name = "choiceBoolean", type = CmisChoiceBooleanType.class),
-        @XmlElement(name = "choiceUri", type = CmisChoiceUriType.class)
-    })
-    protected List<CmisChoiceType> choice;
     protected Boolean openChoice;
     @XmlAnyElement(lax = true)
     protected List<Object> any;
     @XmlAnyAttribute
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
     /**
      * Gets the value of the id property.
      * 
@@ -178,27 +133,51 @@ public class CmisPropertyDefinitionType {
     }
 
     /**
-     * Gets the value of the package property.
+     * Gets the value of the localName property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getPackage() {
-        return _package;
+    public String getLocalName() {
+        return localName;
     }
 
     /**
-     * Sets the value of the package property.
+     * Sets the value of the localName property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setPackage(String value) {
-        this._package = value;
+    public void setLocalName(String value) {
+        this.localName = value;
+    }
+
+    /**
+     * Gets the value of the localNamespace property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLocalNamespace() {
+        return localNamespace;
+    }
+
+    /**
+     * Sets the value of the localNamespace property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLocalNamespace(String value) {
+        this.localNamespace = value;
     }
 
     /**
@@ -225,6 +204,30 @@ public class CmisPropertyDefinitionType {
         this.displayName = value;
     }
 
+    /**
+     * Gets the value of the queryName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getQueryName() {
+        return queryName;
+    }
+
+    /**
+     * Sets the value of the queryName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setQueryName(String value) {
+        this.queryName = value;
+    }
+
     /**
      * Gets the value of the description property.
      * 
@@ -393,43 +396,6 @@ public class CmisPropertyDefinitionType {
         this.orderable = value;
     }
 
-    /**
-     * Gets the value of the choice property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the choice property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getChoice().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceIdType }
-     * {@link CmisChoiceDateTimeType }
-     * {@link CmisChoiceStringType }
-     * {@link CmisChoiceIntegerType }
-     * {@link CmisChoiceDecimalType }
-     * {@link CmisChoiceXmlType }
-     * {@link CmisChoiceHtmlType }
-     * {@link CmisChoiceBooleanType }
-     * {@link CmisChoiceUriType }
-     * 
-     * 
-     */
-    public List<CmisChoiceType> getChoice() {
-        if (choice == null) {
-            choice = new ArrayList<CmisChoiceType>();
-        }
-        return this.choice;
-    }
-
     /**
      * Gets the value of the openChoice property.
      * 
@@ -472,8 +438,8 @@ public class CmisPropertyDefinitionType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyHtml.java

@@ -125,8 +125,8 @@ public class CmisPropertyHtml
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
-         * {@link Object }
          * {@link Element }
+         * {@link Object }
          * 
          * 
          */

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyHtmlDefinitionType.java

@@ -18,7 +18,8 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceHtmlType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyHtml" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceHtml" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -29,41 +30,67 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyHtmlDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "defaultValue"
+    "defaultValue",
+    "choice"
 })
 public class CmisPropertyHtmlDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceHtmlType> defaultValue;
+    protected CmisPropertyHtml defaultValue;
+    protected List<CmisChoiceHtml> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyHtml }
+     *     
+     */
+    public CmisPropertyHtml getDefaultValue() {
+        return defaultValue;
+    }
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyHtml }
+     *     
+     */
+    public void setDefaultValue(CmisPropertyHtml value) {
+        this.defaultValue = value;
+    }
+
+    /**
+     * Gets the value of the choice property.
+     * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getDefaultValue().add(newItem);
+     *    getChoice().add(newItem);
      * </pre>
      * 
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceHtmlType }
+     * {@link CmisChoiceHtml }
      * 
      * 
      */
-    public List<CmisChoiceHtmlType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceHtmlType>();
+    public List<CmisChoiceHtml> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceHtml>();
         }
-        return this.defaultValue;
+        return this.choice;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyIdDefinitionType.java

@@ -18,7 +18,8 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceIdType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyId" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceId" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -29,41 +30,67 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyIdDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "defaultValue"
+    "defaultValue",
+    "choice"
 })
 public class CmisPropertyIdDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceIdType> defaultValue;
+    protected CmisPropertyId defaultValue;
+    protected List<CmisChoiceId> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyId }
+     *     
+     */
+    public CmisPropertyId getDefaultValue() {
+        return defaultValue;
+    }
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyId }
+     *     
+     */
+    public void setDefaultValue(CmisPropertyId value) {
+        this.defaultValue = value;
+    }
+
+    /**
+     * Gets the value of the choice property.
+     * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getDefaultValue().add(newItem);
+     *    getChoice().add(newItem);
      * </pre>
      * 
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceIdType }
+     * {@link CmisChoiceId }
      * 
      * 
      */
-    public List<CmisChoiceIdType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceIdType>();
+    public List<CmisChoiceId> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceId>();
         }
-        return this.defaultValue;
+        return this.choice;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyIntegerDefinitionType.java

@@ -19,9 +19,10 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceIntegerType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyInteger" minOccurs="0"/>
  *         <element name="maxValue" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="minValue" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceInteger" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -34,43 +35,40 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "cmisPropertyIntegerDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "defaultValue",
     "maxValue",
-    "minValue"
+    "minValue",
+    "choice"
 })
 public class CmisPropertyIntegerDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceIntegerType> defaultValue;
+    protected CmisPropertyInteger defaultValue;
     protected BigInteger maxValue;
     protected BigInteger minValue;
+    protected List<CmisChoiceInteger> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDefaultValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceIntegerType }
-     * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyInteger }
      * 
      */
-    public List<CmisChoiceIntegerType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceIntegerType>();
+    public CmisPropertyInteger getDefaultValue() {
+        return defaultValue;
     }
-        return this.defaultValue;
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyInteger }
+     * 
+     */
+    public void setDefaultValue(CmisPropertyInteger value) {
+        this.defaultValue = value;
     }
 
     /**
@@ -121,4 +119,33 @@ public class CmisPropertyIntegerDefinitionType
         this.minValue = value;
     }
 
+    /**
+     * Gets the value of the choice property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getChoice().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisChoiceInteger }
+     * 
+     * 
+     */
+    public List<CmisChoiceInteger> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceInteger>();
+        }
+        return this.choice;
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyStringDefinitionType.java

@@ -19,8 +19,9 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceStringType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyString" minOccurs="0"/>
  *         <element name="maxLength" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceString" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -32,42 +33,39 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyStringDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "defaultValue",
-    "maxLength"
+    "maxLength",
+    "choice"
 })
 public class CmisPropertyStringDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceStringType> defaultValue;
+    protected CmisPropertyString defaultValue;
     protected BigInteger maxLength;
+    protected List<CmisChoiceString> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDefaultValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceStringType }
-     * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyString }
      * 
      */
-    public List<CmisChoiceStringType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceStringType>();
+    public CmisPropertyString getDefaultValue() {
+        return defaultValue;
     }
-        return this.defaultValue;
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyString }
+     * 
+     */
+    public void setDefaultValue(CmisPropertyString value) {
+        this.defaultValue = value;
     }
 
     /**
@@ -94,4 +92,33 @@ public class CmisPropertyStringDefinitionType
         this.maxLength = value;
     }
 
+    /**
+     * Gets the value of the choice property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getChoice().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisChoiceString }
+     * 
+     * 
+     */
+    public List<CmisChoiceString> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceString>();
+        }
+        return this.choice;
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyUriDefinitionType.java

@@ -18,7 +18,8 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceUriType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyUri" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceUri" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -29,41 +30,67 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyUriDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "defaultValue"
+    "defaultValue",
+    "choice"
 })
 public class CmisPropertyUriDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceUriType> defaultValue;
+    protected CmisPropertyUri defaultValue;
+    protected List<CmisChoiceUri> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyUri }
+     *     
+     */
+    public CmisPropertyUri getDefaultValue() {
+        return defaultValue;
+    }
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyUri }
+     *     
+     */
+    public void setDefaultValue(CmisPropertyUri value) {
+        this.defaultValue = value;
+    }
+
+    /**
+     * Gets the value of the choice property.
+     * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getDefaultValue().add(newItem);
+     *    getChoice().add(newItem);
      * </pre>
      * 
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceUriType }
+     * {@link CmisChoiceUri }
      * 
      * 
      */
-    public List<CmisChoiceUriType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceUriType>();
+    public List<CmisChoiceUri> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceUri>();
         }
-        return this.defaultValue;
+        return this.choice;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyXhtml.java

@@ -0,0 +1,142 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for cmisPropertyXhtml complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisPropertyXhtml">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisProperty">
+ *       &lt;sequence>
+ *         &lt;element name="value" maxOccurs="unbounded" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;any/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisPropertyXhtml", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "value"
+})
+public class CmisPropertyXhtml
+    extends CmisProperty
+{
+
+    protected List<CmisPropertyXhtml.Value> value;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the value property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getValue().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisPropertyXhtml.Value }
+     * 
+     * 
+     */
+    public List<CmisPropertyXhtml.Value> getValue() {
+        if (value == null) {
+            value = new ArrayList<CmisPropertyXhtml.Value>();
+        }
+        return this.value;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence>
+     *         &lt;any/>
+     *       &lt;/sequence>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+        "any"
+    })
+    public static class Value {
+
+        @XmlAnyElement(lax = true)
+        protected List<Object> any;
+
+        /**
+         * Gets the value of the any property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the any property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getAny().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link Element }
+         * {@link Object }
+         * 
+         * 
+         */
+        public List<Object> getAny() {
+            if (any == null) {
+                any = new ArrayList<Object>();
+            }
+            return this.any;
+        }
+
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyXhtmlDefinitionType.java

@@ -0,0 +1,96 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for cmisPropertyXhtmlDefinitionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisPropertyXhtmlDefinitionType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
+ *       &lt;sequence>
+ *         &lt;element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyXhtml" minOccurs="0"/>
+ *         &lt;element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceXhtml" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisPropertyXhtmlDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "defaultValue",
+    "choice"
+})
+public class CmisPropertyXhtmlDefinitionType
+    extends CmisPropertyDefinitionType
+{
+
+    protected CmisPropertyXhtml defaultValue;
+    protected List<CmisChoiceXhtml> choice;
+
+    /**
+     * Gets the value of the defaultValue property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyXhtml }
+     *     
+     */
+    public CmisPropertyXhtml getDefaultValue() {
+        return defaultValue;
+    }
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyXhtml }
+     *     
+     */
+    public void setDefaultValue(CmisPropertyXhtml value) {
+        this.defaultValue = value;
+    }
+
+    /**
+     * Gets the value of the choice property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getChoice().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisChoiceXhtml }
+     * 
+     * 
+     */
+    public List<CmisChoiceXhtml> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceXhtml>();
+        }
+        return this.choice;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyXml.java

@@ -125,8 +125,8 @@ public class CmisPropertyXml
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
-         * {@link Object }
          * {@link Element }
+         * {@link Object }
          * 
          * 
          */

source/generated/org/alfresco/repo/cmis/ws/CmisPropertyXmlDefinitionType.java

@@ -19,8 +19,9 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <extension base="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDefinitionType">
  *       <sequence>
- *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceXmlType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="defaultValue" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyXml" minOccurs="0"/>
  *         <element name="schemaURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="choice" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisChoiceXml" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
@@ -32,43 +33,40 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisPropertyXmlDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
     "defaultValue",
-    "schemaURI"
+    "schemaURI",
+    "choice"
 })
 public class CmisPropertyXmlDefinitionType
     extends CmisPropertyDefinitionType
 {
 
-    protected List<CmisChoiceXmlType> defaultValue;
+    protected CmisPropertyXml defaultValue;
     @XmlSchemaType(name = "anyURI")
     protected String schemaURI;
+    protected List<CmisChoiceXml> choice;
 
     /**
      * Gets the value of the defaultValue property.
      * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the defaultValue property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDefaultValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CmisChoiceXmlType }
-     * 
+     * @return
+     *     possible object is
+     *     {@link CmisPropertyXml }
      * 
      */
-    public List<CmisChoiceXmlType> getDefaultValue() {
-        if (defaultValue == null) {
-            defaultValue = new ArrayList<CmisChoiceXmlType>();
+    public CmisPropertyXml getDefaultValue() {
+        return defaultValue;
     }
-        return this.defaultValue;
+
+    /**
+     * Sets the value of the defaultValue property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisPropertyXml }
+     * 
+     */
+    public void setDefaultValue(CmisPropertyXml value) {
+        this.defaultValue = value;
     }
 
     /**
@@ -95,4 +93,33 @@ public class CmisPropertyXmlDefinitionType
         this.schemaURI = value;
     }
 
+    /**
+     * Gets the value of the choice property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the choice property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getChoice().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisChoiceXml }
+     * 
+     * 
+     */
+    public List<CmisChoiceXml> getChoice() {
+        if (choice == null) {
+            choice = new ArrayList<CmisChoiceXml>();
+        }
+        return this.choice;
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/CmisQueryType.java

@@ -2,14 +2,20 @@
 package org.alfresco.repo.cmis.ws;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
 
 
 /**
@@ -25,10 +31,12 @@ import javax.xml.namespace.QName;
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="statement" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="searchAllVersions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="pageSize" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         <element name="maxItems" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="skipCount" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         <element name="returnAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="extension" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAnyXml" minOccurs="0"/>
+ *         <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="includeRelationships" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumIncludeRelationships" minOccurs="0"/>
+ *         <element name="includeRenditions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <any/>
  *       </sequence>
  *       <attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
  *     </restriction>
@@ -43,10 +51,12 @@ import javax.xml.namespace.QName;
     "repositoryId",
     "statement",
     "searchAllVersions",
-    "pageSize",
+    "maxItems",
     "skipCount",
-    "returnAllowableActions",
-    "extension"
+    "includeAllowableActions",
+    "includeRelationships",
+    "includeRenditions",
+    "any"
 })
 public class CmisQueryType {
 
@@ -54,10 +64,16 @@ public class CmisQueryType {
     @XmlElement(required = true)
     protected String statement;
     protected Boolean searchAllVersions;
-    protected BigInteger pageSize;
+    protected BigInteger maxItems;
     protected BigInteger skipCount;
-    protected Boolean returnAllowableActions;
-    protected CmisAnyXml extension;
+    @XmlElementRef(name = "includeAllowableActions", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", type = JAXBElement.class)
+    protected JAXBElement<Boolean> includeAllowableActions;
+    @XmlElementRef(name = "includeRelationships", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", type = JAXBElement.class)
+    protected JAXBElement<EnumIncludeRelationships> includeRelationships;
+    @XmlElementRef(name = "includeRenditions", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", type = JAXBElement.class)
+    protected JAXBElement<Boolean> includeRenditions;
+    @XmlAnyElement(lax = true)
+    protected List<Object> any;
     @XmlAnyAttribute
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
@@ -134,27 +150,27 @@ public class CmisQueryType {
     }
 
     /**
-     * Gets the value of the pageSize property.
+     * Gets the value of the maxItems property.
      * 
      * @return
      *     possible object is
      *     {@link BigInteger }
      *     
      */
-    public BigInteger getPageSize() {
-        return pageSize;
+    public BigInteger getMaxItems() {
+        return maxItems;
     }
 
     /**
-     * Sets the value of the pageSize property.
+     * Sets the value of the maxItems property.
      * 
      * @param value
      *     allowed object is
      *     {@link BigInteger }
      *     
      */
-    public void setPageSize(BigInteger value) {
-        this.pageSize = value;
+    public void setMaxItems(BigInteger value) {
+        this.maxItems = value;
     }
 
     /**
@@ -182,51 +198,105 @@ public class CmisQueryType {
     }
 
     /**
-     * Gets the value of the returnAllowableActions property.
+     * Gets the value of the includeAllowableActions property.
      * 
      * @return
      *     possible object is
-     *     {@link Boolean }
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
      *     
      */
-    public Boolean isReturnAllowableActions() {
-        return returnAllowableActions;
+    public JAXBElement<Boolean> getIncludeAllowableActions() {
+        return includeAllowableActions;
     }
 
     /**
-     * Sets the value of the returnAllowableActions property.
+     * Sets the value of the includeAllowableActions property.
      * 
      * @param value
      *     allowed object is
-     *     {@link Boolean }
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
      *     
      */
-    public void setReturnAllowableActions(Boolean value) {
-        this.returnAllowableActions = value;
+    public void setIncludeAllowableActions(JAXBElement<Boolean> value) {
+        this.includeAllowableActions = ((JAXBElement<Boolean> ) value);
     }
 
     /**
-     * Gets the value of the extension property.
+     * Gets the value of the includeRelationships property.
      * 
      * @return
      *     possible object is
-     *     {@link CmisAnyXml }
+     *     {@link JAXBElement }{@code <}{@link EnumIncludeRelationships }{@code >}
      *     
      */
-    public CmisAnyXml getExtension() {
-        return extension;
+    public JAXBElement<EnumIncludeRelationships> getIncludeRelationships() {
+        return includeRelationships;
     }
 
     /**
-     * Sets the value of the extension property.
+     * Sets the value of the includeRelationships property.
      * 
      * @param value
      *     allowed object is
-     *     {@link CmisAnyXml }
+     *     {@link JAXBElement }{@code <}{@link EnumIncludeRelationships }{@code >}
      *     
      */
-    public void setExtension(CmisAnyXml value) {
-        this.extension = value;
+    public void setIncludeRelationships(JAXBElement<EnumIncludeRelationships> value) {
+        this.includeRelationships = ((JAXBElement<EnumIncludeRelationships> ) value);
+    }
+
+    /**
+     * Gets the value of the includeRenditions property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public JAXBElement<Boolean> getIncludeRenditions() {
+        return includeRenditions;
+    }
+
+    /**
+     * Sets the value of the includeRenditions property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public void setIncludeRenditions(JAXBElement<Boolean> value) {
+        this.includeRenditions = ((JAXBElement<Boolean> ) value);
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Element }
+     * {@link Object }
+     * 
+     *     
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
     }
 
     /**

source/generated/org/alfresco/repo/cmis/ws/CmisRenditionType.java

@@ -0,0 +1,281 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.math.BigInteger;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for cmisRenditionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisRenditionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="streamId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="mimetype" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="length" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         &lt;element name="title" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="kind" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="height" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         &lt;element name="width" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         &lt;element name="renditionDocumentId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;any/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisRenditionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "streamId",
+    "mimetype",
+    "length",
+    "title",
+    "kind",
+    "height",
+    "width",
+    "renditionDocumentId",
+    "any"
+})
+public class CmisRenditionType {
+
+    @XmlElement(required = true)
+    protected String streamId;
+    protected String mimetype;
+    protected BigInteger length;
+    protected String title;
+    protected String kind;
+    protected BigInteger height;
+    protected BigInteger width;
+    protected String renditionDocumentId;
+    @XmlAnyElement(lax = true)
+    protected Object any;
+
+    /**
+     * Gets the value of the streamId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getStreamId() {
+        return streamId;
+    }
+
+    /**
+     * Sets the value of the streamId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStreamId(String value) {
+        this.streamId = value;
+    }
+
+    /**
+     * Gets the value of the mimetype property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getMimetype() {
+        return mimetype;
+    }
+
+    /**
+     * Sets the value of the mimetype property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMimetype(String value) {
+        this.mimetype = value;
+    }
+
+    /**
+     * Gets the value of the length property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getLength() {
+        return length;
+    }
+
+    /**
+     * Sets the value of the length property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setLength(BigInteger value) {
+        this.length = value;
+    }
+
+    /**
+     * Gets the value of the title property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Sets the value of the title property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTitle(String value) {
+        this.title = value;
+    }
+
+    /**
+     * Gets the value of the kind property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getKind() {
+        return kind;
+    }
+
+    /**
+     * Sets the value of the kind property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setKind(String value) {
+        this.kind = value;
+    }
+
+    /**
+     * Gets the value of the height property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getHeight() {
+        return height;
+    }
+
+    /**
+     * Sets the value of the height property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setHeight(BigInteger value) {
+        this.height = value;
+    }
+
+    /**
+     * Gets the value of the width property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getWidth() {
+        return width;
+    }
+
+    /**
+     * Sets the value of the width property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setWidth(BigInteger value) {
+        this.width = value;
+    }
+
+    /**
+     * Gets the value of the renditionDocumentId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRenditionDocumentId() {
+        return renditionDocumentId;
+    }
+
+    /**
+     * Sets the value of the renditionDocumentId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRenditionDocumentId(String value) {
+        this.renditionDocumentId = value;
+    }
+
+    /**
+     * Gets the value of the any property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Object }
+     *     
+     */
+    public Object getAny() {
+        return any;
+    }
+
+    /**
+     * Sets the value of the any property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Object }
+     *     
+     */
+    public void setAny(Object value) {
+        this.any = value;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisRepositoryCapabilitiesType.java

@@ -25,18 +25,20 @@ import org.w3c.dom.Element;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
+ *         <element name="capabilityACL" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityACL" minOccurs="0"/>
+ *         <element name="capabilityAllVersionsSearchable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="capabilityChanges" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityChanges"/>
+ *         <element name="capabilityChangesOnType" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumBaseObjectTypeIds" maxOccurs="unbounded"/>
+ *         <element name="capabilityContentStreamUpdatability" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityContentStreamUpdates"/>
+ *         <element name="capabilityGetDescendants" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="capabilityMultifiling" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="capabilityPWCSearchable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="capabilityPWCUpdateable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="capabilityQuery" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityQuery"/>
+ *         <element name="capabilityRenditions" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityRendition"/>
  *         <element name="capabilityUnfiling" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="capabilityVersionSpecificFiling" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="capabilityPWCUpdateable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="capabilityPWCSearchable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="capabilityAllVersionsSearchable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="capabilityQuery" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityQuery"/>
  *         <element name="capabilityJoin" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityJoin"/>
- *         <element name="capabilityChanges" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityChanges" maxOccurs="unbounded"/>
- *         <element name="changesIncomplete" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="capabilityACL" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumCapabilityACL"/>
- *         <element name="permissionsSupported" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPermissionSetType" maxOccurs="unbounded" minOccurs="0"/>
  *         <any/>
  *       </sequence>
  *       <attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
@@ -49,43 +51,182 @@ import org.w3c.dom.Element;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisRepositoryCapabilitiesType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
+    "capabilityACL",
+    "capabilityAllVersionsSearchable",
+    "capabilityChanges",
+    "capabilityChangesOnType",
+    "capabilityContentStreamUpdatability",
+    "capabilityGetDescendants",
     "capabilityMultifiling",
+    "capabilityPWCSearchable",
+    "capabilityPWCUpdateable",
+    "capabilityQuery",
+    "capabilityRenditions",
     "capabilityUnfiling",
     "capabilityVersionSpecificFiling",
-    "capabilityPWCUpdateable",
-    "capabilityPWCSearchable",
-    "capabilityAllVersionsSearchable",
-    "capabilityQuery",
     "capabilityJoin",
-    "capabilityChanges",
-    "changesIncomplete",
-    "capabilityACL",
-    "permissionsSupported",
     "any"
 })
 public class CmisRepositoryCapabilitiesType {
 
-    protected boolean capabilityMultifiling;
-    protected boolean capabilityUnfiling;
-    protected boolean capabilityVersionSpecificFiling;
-    protected boolean capabilityPWCUpdateable;
-    protected boolean capabilityPWCSearchable;
+    protected EnumCapabilityACL capabilityACL;
     protected boolean capabilityAllVersionsSearchable;
     @XmlElement(required = true)
+    protected EnumCapabilityChanges capabilityChanges;
+    @XmlElement(required = true)
+    protected List<EnumBaseObjectTypeIds> capabilityChangesOnType;
+    @XmlElement(required = true)
+    protected EnumCapabilityContentStreamUpdates capabilityContentStreamUpdatability;
+    protected boolean capabilityGetDescendants;
+    protected boolean capabilityMultifiling;
+    protected boolean capabilityPWCSearchable;
+    protected boolean capabilityPWCUpdateable;
+    @XmlElement(required = true)
     protected EnumCapabilityQuery capabilityQuery;
     @XmlElement(required = true)
+    protected EnumCapabilityRendition capabilityRenditions;
+    protected boolean capabilityUnfiling;
+    protected boolean capabilityVersionSpecificFiling;
+    @XmlElement(required = true)
     protected EnumCapabilityJoin capabilityJoin;
-    @XmlElement(required = true)
-    protected List<EnumCapabilityChanges> capabilityChanges;
-    protected Boolean changesIncomplete;
-    @XmlElement(required = true)
-    protected EnumCapabilityACL capabilityACL;
-    protected List<CmisPermissionSetType> permissionsSupported;
     @XmlAnyElement
     protected List<Element> any;
     @XmlAnyAttribute
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
+    /**
+     * Gets the value of the capabilityACL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnumCapabilityACL }
+     *     
+     */
+    public EnumCapabilityACL getCapabilityACL() {
+        return capabilityACL;
+    }
+
+    /**
+     * Sets the value of the capabilityACL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnumCapabilityACL }
+     *     
+     */
+    public void setCapabilityACL(EnumCapabilityACL value) {
+        this.capabilityACL = value;
+    }
+
+    /**
+     * Gets the value of the capabilityAllVersionsSearchable property.
+     * 
+     */
+    public boolean isCapabilityAllVersionsSearchable() {
+        return capabilityAllVersionsSearchable;
+    }
+
+    /**
+     * Sets the value of the capabilityAllVersionsSearchable property.
+     * 
+     */
+    public void setCapabilityAllVersionsSearchable(boolean value) {
+        this.capabilityAllVersionsSearchable = value;
+    }
+
+    /**
+     * Gets the value of the capabilityChanges property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnumCapabilityChanges }
+     *     
+     */
+    public EnumCapabilityChanges getCapabilityChanges() {
+        return capabilityChanges;
+    }
+
+    /**
+     * Sets the value of the capabilityChanges property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnumCapabilityChanges }
+     * 
+     */
+    public void setCapabilityChanges(EnumCapabilityChanges value) {
+        this.capabilityChanges = value;
+    }
+
+    /**
+     * Gets the value of the capabilityChangesOnType property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the capabilityChangesOnType property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getCapabilityChangesOnType().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EnumBaseObjectTypeIds }
+     * 
+     * 
+     */
+    public List<EnumBaseObjectTypeIds> getCapabilityChangesOnType() {
+        if (capabilityChangesOnType == null) {
+            capabilityChangesOnType = new ArrayList<EnumBaseObjectTypeIds>();
+        }
+        return this.capabilityChangesOnType;
+    }
+
+    /**
+     * Gets the value of the capabilityContentStreamUpdatability property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnumCapabilityContentStreamUpdates }
+     * 
+     */
+    public EnumCapabilityContentStreamUpdates getCapabilityContentStreamUpdatability() {
+        return capabilityContentStreamUpdatability;
+    }
+
+    /**
+     * Sets the value of the capabilityContentStreamUpdatability property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnumCapabilityContentStreamUpdates }
+     * 
+     */
+    public void setCapabilityContentStreamUpdatability(EnumCapabilityContentStreamUpdates value) {
+        this.capabilityContentStreamUpdatability = value;
+    }
+
+    /**
+     * Gets the value of the capabilityGetDescendants property.
+     * 
+     */
+    public boolean isCapabilityGetDescendants() {
+        return capabilityGetDescendants;
+    }
+
+    /**
+     * Sets the value of the capabilityGetDescendants property.
+     * 
+     */
+    public void setCapabilityGetDescendants(boolean value) {
+        this.capabilityGetDescendants = value;
+    }
+
     /**
      * Gets the value of the capabilityMultifiling property.
      * 
@@ -102,6 +243,86 @@ public class CmisRepositoryCapabilitiesType {
         this.capabilityMultifiling = value;
     }
 
+    /**
+     * Gets the value of the capabilityPWCSearchable property.
+     * 
+     */
+    public boolean isCapabilityPWCSearchable() {
+        return capabilityPWCSearchable;
+    }
+
+    /**
+     * Sets the value of the capabilityPWCSearchable property.
+     * 
+     */
+    public void setCapabilityPWCSearchable(boolean value) {
+        this.capabilityPWCSearchable = value;
+    }
+
+    /**
+     * Gets the value of the capabilityPWCUpdateable property.
+     * 
+     */
+    public boolean isCapabilityPWCUpdateable() {
+        return capabilityPWCUpdateable;
+    }
+
+    /**
+     * Sets the value of the capabilityPWCUpdateable property.
+     * 
+     */
+    public void setCapabilityPWCUpdateable(boolean value) {
+        this.capabilityPWCUpdateable = value;
+    }
+
+    /**
+     * Gets the value of the capabilityQuery property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnumCapabilityQuery }
+     *     
+     */
+    public EnumCapabilityQuery getCapabilityQuery() {
+        return capabilityQuery;
+    }
+
+    /**
+     * Sets the value of the capabilityQuery property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnumCapabilityQuery }
+     *     
+     */
+    public void setCapabilityQuery(EnumCapabilityQuery value) {
+        this.capabilityQuery = value;
+    }
+
+    /**
+     * Gets the value of the capabilityRenditions property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnumCapabilityRendition }
+     *     
+     */
+    public EnumCapabilityRendition getCapabilityRenditions() {
+        return capabilityRenditions;
+    }
+
+    /**
+     * Sets the value of the capabilityRenditions property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnumCapabilityRendition }
+     *     
+     */
+    public void setCapabilityRenditions(EnumCapabilityRendition value) {
+        this.capabilityRenditions = value;
+    }
+
     /**
      * Gets the value of the capabilityUnfiling property.
      * 
@@ -134,78 +355,6 @@ public class CmisRepositoryCapabilitiesType {
         this.capabilityVersionSpecificFiling = value;
     }
 
-    /**
-     * Gets the value of the capabilityPWCUpdateable property.
-     * 
-     */
-    public boolean isCapabilityPWCUpdateable() {
-        return capabilityPWCUpdateable;
-    }
-
-    /**
-     * Sets the value of the capabilityPWCUpdateable property.
-     * 
-     */
-    public void setCapabilityPWCUpdateable(boolean value) {
-        this.capabilityPWCUpdateable = value;
-    }
-
-    /**
-     * Gets the value of the capabilityPWCSearchable property.
-     * 
-     */
-    public boolean isCapabilityPWCSearchable() {
-        return capabilityPWCSearchable;
-    }
-
-    /**
-     * Sets the value of the capabilityPWCSearchable property.
-     * 
-     */
-    public void setCapabilityPWCSearchable(boolean value) {
-        this.capabilityPWCSearchable = value;
-    }
-
-    /**
-     * Gets the value of the capabilityAllVersionsSearchable property.
-     * 
-     */
-    public boolean isCapabilityAllVersionsSearchable() {
-        return capabilityAllVersionsSearchable;
-    }
-
-    /**
-     * Sets the value of the capabilityAllVersionsSearchable property.
-     * 
-     */
-    public void setCapabilityAllVersionsSearchable(boolean value) {
-        this.capabilityAllVersionsSearchable = value;
-    }
-
-    /**
-     * Gets the value of the capabilityQuery property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EnumCapabilityQuery }
-     *     
-     */
-    public EnumCapabilityQuery getCapabilityQuery() {
-        return capabilityQuery;
-    }
-
-    /**
-     * Sets the value of the capabilityQuery property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EnumCapabilityQuery }
-     *     
-     */
-    public void setCapabilityQuery(EnumCapabilityQuery value) {
-        this.capabilityQuery = value;
-    }
-
     /**
      * Gets the value of the capabilityJoin property.
      * 
@@ -230,112 +379,6 @@ public class CmisRepositoryCapabilitiesType {
         this.capabilityJoin = value;
     }
 
-    /**
-     * Gets the value of the capabilityChanges property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the capabilityChanges property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCapabilityChanges().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link EnumCapabilityChanges }
-     * 
-     * 
-     */
-    public List<EnumCapabilityChanges> getCapabilityChanges() {
-        if (capabilityChanges == null) {
-            capabilityChanges = new ArrayList<EnumCapabilityChanges>();
-        }
-        return this.capabilityChanges;
-    }
-
-    /**
-     * Gets the value of the changesIncomplete property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isChangesIncomplete() {
-        return changesIncomplete;
-    }
-
-    /**
-     * Sets the value of the changesIncomplete property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setChangesIncomplete(Boolean value) {
-        this.changesIncomplete = value;
-    }
-
-    /**
-     * Gets the value of the capabilityACL property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EnumCapabilityACL }
-     *     
-     */
-    public EnumCapabilityACL getCapabilityACL() {
-        return capabilityACL;
-    }
-
-    /**
-     * Sets the value of the capabilityACL property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EnumCapabilityACL }
-     *     
-     */
-    public void setCapabilityACL(EnumCapabilityACL value) {
-        this.capabilityACL = value;
-    }
-
-    /**
-     * Gets the value of the permissionsSupported property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the permissionsSupported property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPermissionsSupported().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CmisPermissionSetType }
-     * 
-     * 
-     */
-    public List<CmisPermissionSetType> getPermissionsSupported() {
-        if (permissionsSupported == null) {
-            permissionsSupported = new ArrayList<CmisPermissionSetType>();
-        }
-        return this.permissionsSupported;
-    }
-
     /**
      * Gets the value of the any property.
      * 

source/generated/org/alfresco/repo/cmis/ws/CmisRepositoryEntryType.java

@@ -26,9 +26,10 @@ import org.w3c.dom.Element;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="repositoryName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="repositoryURI" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="relationship" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="thinClientURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
  *         <any/>
  *       </sequence>
  *       <attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
@@ -40,96 +41,121 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmisRepositoryEntryType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "repositoryId",
-    "repositoryName",
-    "repositoryURI",
+@XmlType(name = "cmisRepositoryEntryType", propOrder = {
+    "id",
+    "name",
+    "relationship",
+    "thinClientURI",
     "any"
 })
 public class CmisRepositoryEntryType {
 
     @XmlElement(required = true)
-    protected String repositoryId;
-    @XmlElement(required = true)
-    protected String repositoryName;
+    protected String id;
     @XmlElement(required = true)
+    protected String name;
+    protected String relationship;
     @XmlSchemaType(name = "anyURI")
-    protected String repositoryURI;
+    protected String thinClientURI;
     @XmlAnyElement(lax = true)
     protected List<Object> any;
     @XmlAnyAttribute
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
-     * Gets the value of the repositoryId property.
+     * Gets the value of the id property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getRepositoryId() {
-        return repositoryId;
+    public String getId() {
+        return id;
     }
 
     /**
-     * Sets the value of the repositoryId property.
+     * Sets the value of the id property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setRepositoryId(String value) {
-        this.repositoryId = value;
+    public void setId(String value) {
+        this.id = value;
     }
 
     /**
-     * Gets the value of the repositoryName property.
+     * Gets the value of the name property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getRepositoryName() {
-        return repositoryName;
+    public String getName() {
+        return name;
     }
 
     /**
-     * Sets the value of the repositoryName property.
+     * Sets the value of the name property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setRepositoryName(String value) {
-        this.repositoryName = value;
+    public void setName(String value) {
+        this.name = value;
     }
 
     /**
-     * Gets the value of the repositoryURI property.
+     * Gets the value of the relationship property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getRepositoryURI() {
-        return repositoryURI;
+    public String getRelationship() {
+        return relationship;
     }
 
     /**
-     * Sets the value of the repositoryURI property.
+     * Sets the value of the relationship property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setRepositoryURI(String value) {
-        this.repositoryURI = value;
+    public void setRelationship(String value) {
+        this.relationship = value;
+    }
+
+    /**
+     * Gets the value of the thinClientURI property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getThinClientURI() {
+        return thinClientURI;
+    }
+
+    /**
+     * Sets the value of the thinClientURI property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setThinClientURI(String value) {
+        this.thinClientURI = value;
     }
 
     /**
@@ -150,8 +176,8 @@ public class CmisRepositoryEntryType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CmisRepositoryInfoType.java

@@ -1,6 +1,7 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -10,6 +11,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
 import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 import org.w3c.dom.Element;
@@ -33,9 +35,12 @@ import org.w3c.dom.Element;
  *         <element name="productName" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="productVersion" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="rootFolderId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="latestChangeToken" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="capabilities" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisRepositoryCapabilitiesType"/>
- *         <element name="cmisVersionSupported" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="repositorySpecificInformation" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAnyXml" minOccurs="0"/>
+ *         <element name="aclCapability" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisACLCapabilityType" minOccurs="0"/>
+ *         <element name="cmisVersionSupported" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         <element name="thinClientURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="changesIncomplete" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <any/>
  *       </sequence>
  *       <attGroup ref="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisUndefinedAttribute"/>
@@ -56,9 +61,12 @@ import org.w3c.dom.Element;
     "productName",
     "productVersion",
     "rootFolderId",
+    "latestChangeToken",
     "capabilities",
+    "aclCapability",
     "cmisVersionSupported",
-    "repositorySpecificInformation",
+    "thinClientURI",
+    "changesIncomplete",
     "any"
 })
 public class CmisRepositoryInfoType {
@@ -80,10 +88,15 @@ public class CmisRepositoryInfoType {
     @XmlElement(required = true)
     protected String rootFolderId;
     @XmlElement(required = true)
-    protected CmisRepositoryCapabilitiesType capabilities;
+    protected String latestChangeToken;
     @XmlElement(required = true)
-    protected String cmisVersionSupported;
-    protected CmisAnyXml repositorySpecificInformation;
+    protected CmisRepositoryCapabilitiesType capabilities;
+    protected CmisACLCapabilityType aclCapability;
+    @XmlElement(required = true)
+    protected BigDecimal cmisVersionSupported;
+    @XmlSchemaType(name = "anyURI")
+    protected String thinClientURI;
+    protected Boolean changesIncomplete;
     @XmlAnyElement(lax = true)
     protected List<Object> any;
     @XmlAnyAttribute
@@ -281,6 +294,30 @@ public class CmisRepositoryInfoType {
         this.rootFolderId = value;
     }
 
+    /**
+     * Gets the value of the latestChangeToken property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLatestChangeToken() {
+        return latestChangeToken;
+    }
+
+    /**
+     * Sets the value of the latestChangeToken property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLatestChangeToken(String value) {
+        this.latestChangeToken = value;
+    }
+
     /**
      * Gets the value of the capabilities property.
      * 
@@ -305,15 +342,39 @@ public class CmisRepositoryInfoType {
         this.capabilities = value;
     }
 
+    /**
+     * Gets the value of the aclCapability property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CmisACLCapabilityType }
+     *     
+     */
+    public CmisACLCapabilityType getAclCapability() {
+        return aclCapability;
+    }
+
+    /**
+     * Sets the value of the aclCapability property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisACLCapabilityType }
+     *     
+     */
+    public void setAclCapability(CmisACLCapabilityType value) {
+        this.aclCapability = value;
+    }
+
     /**
      * Gets the value of the cmisVersionSupported property.
      * 
      * @return
      *     possible object is
-     *     {@link String }
+     *     {@link BigDecimal }
      *     
      */
-    public String getCmisVersionSupported() {
+    public BigDecimal getCmisVersionSupported() {
         return cmisVersionSupported;
     }
 
@@ -322,35 +383,59 @@ public class CmisRepositoryInfoType {
      * 
      * @param value
      *     allowed object is
-     *     {@link String }
+     *     {@link BigDecimal }
      *     
      */
-    public void setCmisVersionSupported(String value) {
+    public void setCmisVersionSupported(BigDecimal value) {
         this.cmisVersionSupported = value;
     }
 
     /**
-     * Gets the value of the repositorySpecificInformation property.
+     * Gets the value of the thinClientURI property.
      * 
      * @return
      *     possible object is
-     *     {@link CmisAnyXml }
+     *     {@link String }
      *     
      */
-    public CmisAnyXml getRepositorySpecificInformation() {
-        return repositorySpecificInformation;
+    public String getThinClientURI() {
+        return thinClientURI;
     }
 
     /**
-     * Sets the value of the repositorySpecificInformation property.
+     * Sets the value of the thinClientURI property.
      * 
      * @param value
      *     allowed object is
-     *     {@link CmisAnyXml }
+     *     {@link String }
      *     
      */
-    public void setRepositorySpecificInformation(CmisAnyXml value) {
-        this.repositorySpecificInformation = value;
+    public void setThinClientURI(String value) {
+        this.thinClientURI = value;
+    }
+
+    /**
+     * Gets the value of the changesIncomplete property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isChangesIncomplete() {
+        return changesIncomplete;
+    }
+
+    /**
+     * Sets the value of the changesIncomplete property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setChangesIncomplete(Boolean value) {
+        this.changesIncomplete = value;
     }
 
     /**
@@ -371,8 +456,8 @@ public class CmisRepositoryInfoType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CmisTypeContainer.java

@@ -0,0 +1,96 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for cmisTypeContainer complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="cmisTypeContainer">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="type" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisTypeDefinitionType"/>
+ *         &lt;element name="children" type="{http://docs.oasis-open.org/ns/cmis/messaging/200901}cmisTypeContainer" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "cmisTypeContainer", propOrder = {
+    "type",
+    "children"
+})
+public class CmisTypeContainer {
+
+    @XmlElement(required = true)
+    protected CmisTypeDefinitionType type;
+    protected List<CmisTypeContainer> children;
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CmisTypeDefinitionType }
+     *     
+     */
+    public CmisTypeDefinitionType getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisTypeDefinitionType }
+     *     
+     */
+    public void setType(CmisTypeDefinitionType value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the children property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the children property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getChildren().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CmisTypeContainer }
+     * 
+     * 
+     */
+    public List<CmisTypeContainer> getChildren() {
+        if (children == null) {
+            children = new ArrayList<CmisTypeContainer>();
+        }
+        return this.children;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/CmisTypeDefinitionType.java

@@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlAnyAttribute;
 import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
@@ -27,28 +28,32 @@ import org.w3c.dom.Element;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="typeId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="queryName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="displayName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="baseType" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumBaseObjectType"/>
- *         <element name="baseTypeQueryName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="parentId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="localName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="localNamespace" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="queryName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="baseTypeId" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumBaseObjectTypeIds"/>
+ *         <element name="parentId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="creatable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="fileable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="queryable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="controllable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="fulltextindexed" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="includedInSupertypeQuery" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="controllablePolicy" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="controllableACL" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyBooleanDefinition"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyDateTimeDefinition"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyDecimalDefinition"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyHtmlDefinition"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyIdDefinition"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyIntegerDefinition"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyStringDefinition"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyUriDefinition"/>
- *           <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}propertyXmlDefinition"/>
+ *           <element name="propertyBooleanDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyBooleanDefinitionType"/>
+ *           <element name="propertyDateTimeDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDateTimeDefinitionType"/>
+ *           <element name="propertyDecimalDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyDecimalDefinitionType"/>
+ *           <element name="propertyIdDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyIdDefinitionType"/>
+ *           <element name="propertyIntegerDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyIntegerDefinitionType"/>
+ *           <element name="propertyHtmlDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyHtmlDefinitionType"/>
+ *           <element name="propertyXhtmlDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyXhtmlDefinitionType"/>
+ *           <element name="propertyStringDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyStringDefinitionType"/>
+ *           <element name="propertyXmlDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyXmlDefinitionType"/>
+ *           <element name="propertyUriDefinition" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertyUriDefinitionType"/>
  *         </choice>
  *         <any/>
  *       </sequence>
@@ -62,56 +67,62 @@ import org.w3c.dom.Element;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "cmisTypeDefinitionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901", propOrder = {
-    "typeId",
-    "queryName",
+    "id",
+    "localName",
+    "localNamespace",
     "displayName",
-    "baseType",
-    "baseTypeQueryName",
-    "parentId",
+    "queryName",
     "description",
+    "baseTypeId",
+    "parentId",
     "creatable",
     "fileable",
     "queryable",
-    "controllable",
+    "fulltextindexed",
     "includedInSupertypeQuery",
+    "controllablePolicy",
+    "controllableACL",
     "propertyDefinition",
     "any"
 })
 @XmlSeeAlso({
-    CmisTypeRelationshipDefinitionType.class,
+    CmisTypeDocumentDefinitionType.class,
     CmisTypePolicyDefinitionType.class,
     CmisTypeFolderDefinitionType.class,
-    CmisTypeDocumentDefinitionType.class
+    CmisTypeRelationshipDefinitionType.class
 })
 public class CmisTypeDefinitionType {
 
     @XmlElement(required = true)
-    protected String typeId;
-    @XmlElement(required = true)
-    protected String queryName;
+    protected String id;
     @XmlElement(required = true)
+    protected String localName;
+    @XmlSchemaType(name = "anyURI")
+    protected String localNamespace;
     protected String displayName;
-    @XmlElement(required = true)
-    protected EnumBaseObjectType baseType;
-    @XmlElement(required = true)
-    protected String baseTypeQueryName;
-    protected String parentId;
+    protected String queryName;
     protected String description;
+    @XmlElement(required = true)
+    protected EnumBaseObjectTypeIds baseTypeId;
+    protected String parentId;
     protected boolean creatable;
     protected boolean fileable;
     protected boolean queryable;
-    protected boolean controllable;
+    protected boolean fulltextindexed;
     @XmlElement(defaultValue = "true")
     protected boolean includedInSupertypeQuery;
+    protected boolean controllablePolicy;
+    protected boolean controllableACL;
     @XmlElements({
-        @XmlElement(name = "propertyIdDefinition", type = CmisPropertyIdDefinitionType.class),
-        @XmlElement(name = "propertyXmlDefinition", type = CmisPropertyXmlDefinitionType.class),
-        @XmlElement(name = "propertyUriDefinition", type = CmisPropertyUriDefinitionType.class),
-        @XmlElement(name = "propertyDecimalDefinition", type = CmisPropertyDecimalDefinitionType.class),
-        @XmlElement(name = "propertyIntegerDefinition", type = CmisPropertyIntegerDefinitionType.class),
-        @XmlElement(name = "propertyStringDefinition", type = CmisPropertyStringDefinitionType.class),
         @XmlElement(name = "propertyHtmlDefinition", type = CmisPropertyHtmlDefinitionType.class),
+        @XmlElement(name = "propertyXmlDefinition", type = CmisPropertyXmlDefinitionType.class),
         @XmlElement(name = "propertyDateTimeDefinition", type = CmisPropertyDateTimeDefinitionType.class),
+        @XmlElement(name = "propertyUriDefinition", type = CmisPropertyUriDefinitionType.class),
+        @XmlElement(name = "propertyStringDefinition", type = CmisPropertyStringDefinitionType.class),
+        @XmlElement(name = "propertyIntegerDefinition", type = CmisPropertyIntegerDefinitionType.class),
+        @XmlElement(name = "propertyIdDefinition", type = CmisPropertyIdDefinitionType.class),
+        @XmlElement(name = "propertyXhtmlDefinition", type = CmisPropertyXhtmlDefinitionType.class),
+        @XmlElement(name = "propertyDecimalDefinition", type = CmisPropertyDecimalDefinitionType.class),
         @XmlElement(name = "propertyBooleanDefinition", type = CmisPropertyBooleanDefinitionType.class)
     })
     protected List<CmisPropertyDefinitionType> propertyDefinition;
@@ -121,51 +132,75 @@ public class CmisTypeDefinitionType {
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
-     * Gets the value of the typeId property.
+     * Gets the value of the id property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getTypeId() {
-        return typeId;
+    public String getId() {
+        return id;
     }
 
     /**
-     * Sets the value of the typeId property.
+     * Sets the value of the id property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setTypeId(String value) {
-        this.typeId = value;
+    public void setId(String value) {
+        this.id = value;
     }
 
     /**
-     * Gets the value of the queryName property.
+     * Gets the value of the localName property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getQueryName() {
-        return queryName;
+    public String getLocalName() {
+        return localName;
     }
 
     /**
-     * Sets the value of the queryName property.
+     * Sets the value of the localName property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setQueryName(String value) {
-        this.queryName = value;
+    public void setLocalName(String value) {
+        this.localName = value;
+    }
+
+    /**
+     * Gets the value of the localNamespace property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLocalNamespace() {
+        return localNamespace;
+    }
+
+    /**
+     * Sets the value of the localNamespace property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLocalNamespace(String value) {
+        this.localNamespace = value;
     }
 
     /**
@@ -193,75 +228,27 @@ public class CmisTypeDefinitionType {
     }
 
     /**
-     * Gets the value of the baseType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EnumBaseObjectType }
-     *     
-     */
-    public EnumBaseObjectType getBaseType() {
-        return baseType;
-    }
-
-    /**
-     * Sets the value of the baseType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EnumBaseObjectType }
-     *     
-     */
-    public void setBaseType(EnumBaseObjectType value) {
-        this.baseType = value;
-    }
-
-    /**
-     * Gets the value of the baseTypeQueryName property.
+     * Gets the value of the queryName property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getBaseTypeQueryName() {
-        return baseTypeQueryName;
+    public String getQueryName() {
+        return queryName;
     }
 
     /**
-     * Sets the value of the baseTypeQueryName property.
+     * Sets the value of the queryName property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setBaseTypeQueryName(String value) {
-        this.baseTypeQueryName = value;
-    }
-
-    /**
-     * Gets the value of the parentId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getParentId() {
-        return parentId;
-    }
-
-    /**
-     * Sets the value of the parentId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setParentId(String value) {
-        this.parentId = value;
+    public void setQueryName(String value) {
+        this.queryName = value;
     }
 
     /**
@@ -288,6 +275,54 @@ public class CmisTypeDefinitionType {
         this.description = value;
     }
 
+    /**
+     * Gets the value of the baseTypeId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnumBaseObjectTypeIds }
+     *     
+     */
+    public EnumBaseObjectTypeIds getBaseTypeId() {
+        return baseTypeId;
+    }
+
+    /**
+     * Sets the value of the baseTypeId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnumBaseObjectTypeIds }
+     *     
+     */
+    public void setBaseTypeId(EnumBaseObjectTypeIds value) {
+        this.baseTypeId = value;
+    }
+
+    /**
+     * Gets the value of the parentId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getParentId() {
+        return parentId;
+    }
+
+    /**
+     * Sets the value of the parentId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setParentId(String value) {
+        this.parentId = value;
+    }
+
     /**
      * Gets the value of the creatable property.
      * 
@@ -337,19 +372,19 @@ public class CmisTypeDefinitionType {
     }
 
     /**
-     * Gets the value of the controllable property.
+     * Gets the value of the fulltextindexed property.
      * 
      */
-    public boolean isControllable() {
-        return controllable;
+    public boolean isFulltextindexed() {
+        return fulltextindexed;
     }
 
     /**
-     * Sets the value of the controllable property.
+     * Sets the value of the fulltextindexed property.
      * 
      */
-    public void setControllable(boolean value) {
-        this.controllable = value;
+    public void setFulltextindexed(boolean value) {
+        this.fulltextindexed = value;
     }
 
     /**
@@ -368,6 +403,38 @@ public class CmisTypeDefinitionType {
         this.includedInSupertypeQuery = value;
     }
 
+    /**
+     * Gets the value of the controllablePolicy property.
+     * 
+     */
+    public boolean isControllablePolicy() {
+        return controllablePolicy;
+    }
+
+    /**
+     * Sets the value of the controllablePolicy property.
+     * 
+     */
+    public void setControllablePolicy(boolean value) {
+        this.controllablePolicy = value;
+    }
+
+    /**
+     * Gets the value of the controllableACL property.
+     * 
+     */
+    public boolean isControllableACL() {
+        return controllableACL;
+    }
+
+    /**
+     * Sets the value of the controllableACL property.
+     * 
+     */
+    public void setControllableACL(boolean value) {
+        this.controllableACL = value;
+    }
+
     /**
      * Gets the value of the propertyDefinition property.
      * 
@@ -386,14 +453,15 @@ public class CmisTypeDefinitionType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link CmisPropertyIdDefinitionType }
-     * {@link CmisPropertyXmlDefinitionType }
-     * {@link CmisPropertyUriDefinitionType }
-     * {@link CmisPropertyDecimalDefinitionType }
-     * {@link CmisPropertyIntegerDefinitionType }
-     * {@link CmisPropertyStringDefinitionType }
      * {@link CmisPropertyHtmlDefinitionType }
+     * {@link CmisPropertyXmlDefinitionType }
      * {@link CmisPropertyDateTimeDefinitionType }
+     * {@link CmisPropertyUriDefinitionType }
+     * {@link CmisPropertyStringDefinitionType }
+     * {@link CmisPropertyIntegerDefinitionType }
+     * {@link CmisPropertyIdDefinitionType }
+     * {@link CmisPropertyXhtmlDefinitionType }
+     * {@link CmisPropertyDecimalDefinitionType }
      * {@link CmisPropertyBooleanDefinitionType }
      * 
      * 
@@ -423,8 +491,8 @@ public class CmisTypeDefinitionType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Object }
      * {@link Element }
+     * {@link Object }
      * 
      * 
      */

source/generated/org/alfresco/repo/cmis/ws/CreateDocument.java

@@ -1,6 +1,8 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -21,11 +23,13 @@ import javax.xml.bind.annotation.XmlType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="typeId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="properties" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertiesType"/>
  *         <element name="folderId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="contentStream" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisContentStreamType" minOccurs="0"/>
+ *         <element name="contentStream" type="{http://docs.oasis-open.org/ns/cmis/messaging/200901}cmisContentStreamType" minOccurs="0"/>
  *         <element name="versioningState" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumVersioningState" minOccurs="0"/>
+ *         <element name="applyPolicies" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="addACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
+ *         <element name="removeACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -37,11 +41,13 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "repositoryId",
-    "typeId",
     "properties",
     "folderId",
     "contentStream",
-    "versioningState"
+    "versioningState",
+    "applyPolicies",
+    "addACEs",
+    "removeACEs"
 })
 @XmlRootElement(name = "createDocument")
 public class CreateDocument {
@@ -49,14 +55,18 @@ public class CreateDocument {
     @XmlElement(required = true)
     protected String repositoryId;
     @XmlElement(required = true)
-    protected String typeId;
-    @XmlElement(required = true)
     protected CmisPropertiesType properties;
     protected String folderId;
     @XmlElementRef(name = "contentStream", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<CmisContentStreamType> contentStream;
     @XmlElementRef(name = "versioningState", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<EnumVersioningState> versioningState;
+    @XmlElement(nillable = true)
+    protected List<String> applyPolicies;
+    @XmlElementRef(name = "addACEs", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<CmisAccessControlListType> addACEs;
+    @XmlElementRef(name = "removeACEs", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<CmisAccessControlListType> removeACEs;
 
     /**
      * Gets the value of the repositoryId property.
@@ -82,30 +92,6 @@ public class CreateDocument {
         this.repositoryId = value;
     }
 
-    /**
-     * Gets the value of the typeId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeId() {
-        return typeId;
-    }
-
-    /**
-     * Sets the value of the typeId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeId(String value) {
-        this.typeId = value;
-    }
-
     /**
      * Gets the value of the properties property.
      * 
@@ -202,4 +188,81 @@ public class CreateDocument {
         this.versioningState = ((JAXBElement<EnumVersioningState> ) value);
     }
 
+    /**
+     * Gets the value of the applyPolicies property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the applyPolicies property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getApplyPolicies().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getApplyPolicies() {
+        if (applyPolicies == null) {
+            applyPolicies = new ArrayList<String>();
+        }
+        return this.applyPolicies;
+    }
+
+    /**
+     * Gets the value of the addACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public JAXBElement<CmisAccessControlListType> getAddACEs() {
+        return addACEs;
+    }
+
+    /**
+     * Sets the value of the addACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public void setAddACEs(JAXBElement<CmisAccessControlListType> value) {
+        this.addACEs = ((JAXBElement<CmisAccessControlListType> ) value);
+    }
+
+    /**
+     * Gets the value of the removeACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public JAXBElement<CmisAccessControlListType> getRemoveACEs() {
+        return removeACEs;
+    }
+
+    /**
+     * Sets the value of the removeACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public void setRemoveACEs(JAXBElement<CmisAccessControlListType> value) {
+        this.removeACEs = ((JAXBElement<CmisAccessControlListType> ) value);
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/CreateFolder.java

@@ -1,9 +1,13 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -19,9 +23,11 @@ import javax.xml.bind.annotation.XmlType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="typeId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="properties" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertiesType"/>
  *         <element name="folderId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="applyPolicies" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="addACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
+ *         <element name="removeACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -33,9 +39,11 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "repositoryId",
-    "typeId",
     "properties",
-    "folderId"
+    "folderId",
+    "applyPolicies",
+    "addACEs",
+    "removeACEs"
 })
 @XmlRootElement(name = "createFolder")
 public class CreateFolder {
@@ -43,11 +51,15 @@ public class CreateFolder {
     @XmlElement(required = true)
     protected String repositoryId;
     @XmlElement(required = true)
-    protected String typeId;
-    @XmlElement(required = true)
     protected CmisPropertiesType properties;
     @XmlElement(required = true)
     protected String folderId;
+    @XmlElement(nillable = true)
+    protected List<String> applyPolicies;
+    @XmlElementRef(name = "addACEs", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<CmisAccessControlListType> addACEs;
+    @XmlElementRef(name = "removeACEs", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<CmisAccessControlListType> removeACEs;
 
     /**
      * Gets the value of the repositoryId property.
@@ -73,30 +85,6 @@ public class CreateFolder {
         this.repositoryId = value;
     }
 
-    /**
-     * Gets the value of the typeId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeId() {
-        return typeId;
-    }
-
-    /**
-     * Sets the value of the typeId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeId(String value) {
-        this.typeId = value;
-    }
-
     /**
      * Gets the value of the properties property.
      * 
@@ -145,4 +133,81 @@ public class CreateFolder {
         this.folderId = value;
     }
 
+    /**
+     * Gets the value of the applyPolicies property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the applyPolicies property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getApplyPolicies().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getApplyPolicies() {
+        if (applyPolicies == null) {
+            applyPolicies = new ArrayList<String>();
+        }
+        return this.applyPolicies;
+    }
+
+    /**
+     * Gets the value of the addACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public JAXBElement<CmisAccessControlListType> getAddACEs() {
+        return addACEs;
+    }
+
+    /**
+     * Sets the value of the addACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public void setAddACEs(JAXBElement<CmisAccessControlListType> value) {
+        this.addACEs = ((JAXBElement<CmisAccessControlListType> ) value);
+    }
+
+    /**
+     * Gets the value of the removeACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public JAXBElement<CmisAccessControlListType> getRemoveACEs() {
+        return removeACEs;
+    }
+
+    /**
+     * Sets the value of the removeACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public void setRemoveACEs(JAXBElement<CmisAccessControlListType> value) {
+        this.removeACEs = ((JAXBElement<CmisAccessControlListType> ) value);
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/CreatePolicy.java

@@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="typeId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="properties" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertiesType"/>
  *         <element name="folderId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       </sequence>
@@ -35,7 +34,6 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "repositoryId",
-    "typeId",
     "properties",
     "folderId"
 })
@@ -45,8 +43,6 @@ public class CreatePolicy {
     @XmlElement(required = true)
     protected String repositoryId;
     @XmlElement(required = true)
-    protected String typeId;
-    @XmlElement(required = true)
     protected CmisPropertiesType properties;
     @XmlElementRef(name = "folderId", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<String> folderId;
@@ -75,30 +71,6 @@ public class CreatePolicy {
         this.repositoryId = value;
     }
 
-    /**
-     * Gets the value of the typeId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeId() {
-        return typeId;
-    }
-
-    /**
-     * Sets the value of the typeId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeId(String value) {
-        this.typeId = value;
-    }
-
     /**
      * Gets the value of the properties property.
      * 

source/generated/org/alfresco/repo/cmis/ws/CreateRelationship.java

@@ -1,9 +1,13 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -19,10 +23,12 @@ import javax.xml.bind.annotation.XmlType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="typeId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="properties" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisPropertiesType"/>
  *         <element name="sourceObjectId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="targetObjectId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="applyPolicies" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="addACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
+ *         <element name="removeACEs" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -34,10 +40,12 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "repositoryId",
-    "typeId",
     "properties",
     "sourceObjectId",
-    "targetObjectId"
+    "targetObjectId",
+    "applyPolicies",
+    "addACEs",
+    "removeACEs"
 })
 @XmlRootElement(name = "createRelationship")
 public class CreateRelationship {
@@ -45,13 +53,17 @@ public class CreateRelationship {
     @XmlElement(required = true)
     protected String repositoryId;
     @XmlElement(required = true)
-    protected String typeId;
-    @XmlElement(required = true)
     protected CmisPropertiesType properties;
     @XmlElement(required = true)
     protected String sourceObjectId;
     @XmlElement(required = true)
     protected String targetObjectId;
+    @XmlElement(nillable = true)
+    protected List<String> applyPolicies;
+    @XmlElementRef(name = "addACEs", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<CmisAccessControlListType> addACEs;
+    @XmlElementRef(name = "removeACEs", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<CmisAccessControlListType> removeACEs;
 
     /**
      * Gets the value of the repositoryId property.
@@ -77,30 +89,6 @@ public class CreateRelationship {
         this.repositoryId = value;
     }
 
-    /**
-     * Gets the value of the typeId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeId() {
-        return typeId;
-    }
-
-    /**
-     * Sets the value of the typeId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeId(String value) {
-        this.typeId = value;
-    }
-
     /**
      * Gets the value of the properties property.
      * 
@@ -173,4 +161,81 @@ public class CreateRelationship {
         this.targetObjectId = value;
     }
 
+    /**
+     * Gets the value of the applyPolicies property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the applyPolicies property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getApplyPolicies().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getApplyPolicies() {
+        if (applyPolicies == null) {
+            applyPolicies = new ArrayList<String>();
+        }
+        return this.applyPolicies;
+    }
+
+    /**
+     * Gets the value of the addACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public JAXBElement<CmisAccessControlListType> getAddACEs() {
+        return addACEs;
+    }
+
+    /**
+     * Sets the value of the addACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public void setAddACEs(JAXBElement<CmisAccessControlListType> value) {
+        this.addACEs = ((JAXBElement<CmisAccessControlListType> ) value);
+    }
+
+    /**
+     * Gets the value of the removeACEs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public JAXBElement<CmisAccessControlListType> getRemoveACEs() {
+        return removeACEs;
+    }
+
+    /**
+     * Sets the value of the removeACEs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link CmisAccessControlListType }{@code >}
+     *     
+     */
+    public void setRemoveACEs(JAXBElement<CmisAccessControlListType> value) {
+        this.removeACEs = ((JAXBElement<CmisAccessControlListType> ) value);
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/DeleteAllVersionsResponse.java

@@ -1,34 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "deleteAllVersionsResponse")
-public class DeleteAllVersionsResponse {
-
-
-}

source/generated/org/alfresco/repo/cmis/ws/DeleteContentStream.java

@@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlType;
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="documentId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="changeToken" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -31,7 +32,8 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "repositoryId",
-    "documentId"
+    "documentId",
+    "changeToken"
 })
 @XmlRootElement(name = "deleteContentStream")
 public class DeleteContentStream {
@@ -40,6 +42,7 @@ public class DeleteContentStream {
     protected String repositoryId;
     @XmlElement(required = true)
     protected String documentId;
+    protected String changeToken;
 
     /**
      * Gets the value of the repositoryId property.
@@ -89,4 +92,28 @@ public class DeleteContentStream {
         this.documentId = value;
     }
 
+    /**
+     * Gets the value of the changeToken property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getChangeToken() {
+        return changeToken;
+    }
+
+    /**
+     * Sets the value of the changeToken property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setChangeToken(String value) {
+        this.changeToken = value;
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/DeleteContentStreamResponse.java

@@ -3,6 +3,7 @@ package org.alfresco.repo.cmis.ws;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -17,6 +18,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
+ *         <element name="documentId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -26,9 +28,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
+@XmlType(name = "", propOrder = {
+    "documentId"
+})
 @XmlRootElement(name = "deleteContentStreamResponse")
 public class DeleteContentStreamResponse {
 
+    @XmlElement(required = true)
+    protected String documentId;
+
+    /**
+     * Gets the value of the documentId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDocumentId() {
+        return documentId;
+    }
+
+    /**
+     * Sets the value of the documentId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDocumentId(String value) {
+        this.documentId = value;
+    }
 
 }

source/generated/org/alfresco/repo/cmis/ws/DeleteObject.java

@@ -1,9 +1,11 @@
 
 package org.alfresco.repo.cmis.ws;
 
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -20,6 +22,7 @@ import javax.xml.bind.annotation.XmlType;
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="objectId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="allVersions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -31,7 +34,8 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "repositoryId",
-    "objectId"
+    "objectId",
+    "allVersions"
 })
 @XmlRootElement(name = "deleteObject")
 public class DeleteObject {
@@ -40,6 +44,8 @@ public class DeleteObject {
     protected String repositoryId;
     @XmlElement(required = true)
     protected String objectId;
+    @XmlElementRef(name = "allVersions", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<Boolean> allVersions;
 
     /**
      * Gets the value of the repositoryId property.
@@ -89,4 +95,28 @@ public class DeleteObject {
         this.objectId = value;
     }
 
+    /**
+     * Gets the value of the allVersions property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public JAXBElement<Boolean> getAllVersions() {
+        return allVersions;
+    }
+
+    /**
+     * Sets the value of the allVersions property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public void setAllVersions(JAXBElement<Boolean> value) {
+        this.allVersions = ((JAXBElement<Boolean> ) value);
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/DeleteTree.java

@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlType;
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="folderId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="unfileNonfolderObjects" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumUnfileNonfolderObjects"/>
+ *         <element name="unfileObject" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumUnfileObject"/>
  *         <element name="continueOnFailure" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
@@ -36,7 +36,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "", propOrder = {
     "repositoryId",
     "folderId",
-    "unfileNonfolderObjects",
+    "unfileObject",
     "continueOnFailure"
 })
 @XmlRootElement(name = "deleteTree")
@@ -47,7 +47,7 @@ public class DeleteTree {
     @XmlElement(required = true)
     protected String folderId;
     @XmlElement(required = true)
-    protected EnumUnfileNonfolderObjects unfileNonfolderObjects;
+    protected EnumUnfileObject unfileObject;
     @XmlElementRef(name = "continueOnFailure", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<Boolean> continueOnFailure;
 
@@ -100,27 +100,27 @@ public class DeleteTree {
     }
 
     /**
-     * Gets the value of the unfileNonfolderObjects property.
+     * Gets the value of the unfileObject property.
      * 
      * @return
      *     possible object is
-     *     {@link EnumUnfileNonfolderObjects }
+     *     {@link EnumUnfileObject }
      *     
      */
-    public EnumUnfileNonfolderObjects getUnfileNonfolderObjects() {
-        return unfileNonfolderObjects;
+    public EnumUnfileObject getUnfileObject() {
+        return unfileObject;
     }
 
     /**
-     * Sets the value of the unfileNonfolderObjects property.
+     * Sets the value of the unfileObject property.
      * 
      * @param value
      *     allowed object is
-     *     {@link EnumUnfileNonfolderObjects }
+     *     {@link EnumUnfileObject }
      *     
      */
-    public void setUnfileNonfolderObjects(EnumUnfileNonfolderObjects value) {
-        this.unfileNonfolderObjects = value;
+    public void setUnfileObject(EnumUnfileObject value) {
+        this.unfileObject = value;
     }
 
     /**

source/generated/org/alfresco/repo/cmis/ws/DiscoveryService.java

@@ -15,14 +15,14 @@ import javax.xml.ws.WebServiceFeature;
 
 /**
  * This class was generated by Apache CXF 2.1.2
- * Wed May 20 15:06:32 EEST 2009
+ * Fri Jul 24 09:58:28 EEST 2009
  * Generated source version: 2.1.2
  * 
  */
 
 
 @WebServiceClient(name = "DiscoveryService", 
-                  wsdlLocation = "file:/D:/java/eclipse/work/WS-Binding-06c/source/wsdl/CMISWS-Service.wsdl",
+                  wsdlLocation = "file:/D:/work/alfresco-cmis/WS-Binding-062f/source/wsdl/CMISWS-Service.wsdl",
                   targetNamespace = "http://docs.oasis-open.org/ns/cmis/ws/200901") 
 public class DiscoveryService extends Service {
 
@@ -32,9 +32,9 @@ public class DiscoveryService extends Service {
     static {
         URL url = null;
         try {
-            url = new URL("file:/D:/java/eclipse/work/WS-Binding-06c/source/wsdl/CMISWS-Service.wsdl");
+            url = new URL("file:/D:/work/alfresco-cmis/WS-Binding-062f/source/wsdl/CMISWS-Service.wsdl");
         } catch (MalformedURLException e) {
-            System.err.println("Can not initialize the default wsdl from file:/D:/java/eclipse/work/WS-Binding-06c/source/wsdl/CMISWS-Service.wsdl");
+            System.err.println("Can not initialize the default wsdl from file:/D:/work/alfresco-cmis/WS-Binding-062f/source/wsdl/CMISWS-Service.wsdl");
             // e.printStackTrace();
         }
         WSDL_LOCATION = url;

source/generated/org/alfresco/repo/cmis/ws/DiscoveryServicePort.java

@@ -2,16 +2,18 @@ package org.alfresco.repo.cmis.ws;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
+import javax.jws.WebParam.Mode;
 import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 
 /**
  * This class was generated by Apache CXF 2.1.2
- * Wed May 20 15:06:32 EEST 2009
+ * Fri Jul 24 09:58:28 EEST 2009
  * Generated source version: 2.1.2
  * 
  */
@@ -24,8 +26,8 @@ public interface DiscoveryServicePort {
     @WebResult(name = "queryResponse", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", partName = "parameters")
     @WebMethod
     public QueryResponse query(
-        @WebParam(partName = "parameters", name = "query", targetNamespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-        CmisQueryType parameters
+        @WebParam(partName = "parameters", name = "query", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901")
+        Query parameters
     ) throws CmisException;
 
     @ResponseWrapper(localName = "getContentChangesResponse", targetNamespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", className = "org.alfresco.repo.cmis.ws.GetContentChangesResponse")

source/generated/org/alfresco/repo/cmis/ws/EnumACLPropagation.java

@@ -0,0 +1,54 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for enumACLPropagation.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="enumACLPropagation">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="repository-determined"/>
+ *     &lt;enumeration value="object-only"/>
+ *     &lt;enumeration value="propagate"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "enumACLPropagation", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlEnum
+public enum EnumACLPropagation {
+
+    @XmlEnumValue("repository-determined")
+    REPOSITORY_DETERMINED("repository-determined"),
+    @XmlEnumValue("object-only")
+    OBJECT_ONLY("object-only"),
+    @XmlEnumValue("propagate")
+    PROPAGATE("propagate");
+    private final String value;
+
+    EnumACLPropagation(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static EnumACLPropagation fromValue(String v) {
+        for (EnumACLPropagation c: EnumACLPropagation.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/EnumAllowableActionsKey.java

@@ -0,0 +1,159 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for enumAllowableActionsKey.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="enumAllowableActionsKey">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="canGetDescendents.Folder"/>
+ *     &lt;enumeration value="canGetChildren.Folder"/>
+ *     &lt;enumeration value="canGetParents.Folder"/>
+ *     &lt;enumeration value="canGetFolderParent.Object"/>
+ *     &lt;enumeration value="canCreateDocument.Type"/>
+ *     &lt;enumeration value="canCreateDocument.Folder"/>
+ *     &lt;enumeration value="canCreateFolder.Type"/>
+ *     &lt;enumeration value="canCreateFolder.Folder"/>
+ *     &lt;enumeration value="canCreateRelationship.Type"/>
+ *     &lt;enumeration value="canCreateRelationship.Source"/>
+ *     &lt;enumeration value="canCreateRelationship.Target"/>
+ *     &lt;enumeration value="canCreatePolicy.Type"/>
+ *     &lt;enumeration value="canGetProperties.Object"/>
+ *     &lt;enumeration value="canViewContent.Object"/>
+ *     &lt;enumeration value="canUpdateProperties.Object"/>
+ *     &lt;enumeration value="canMove.Object"/>
+ *     &lt;enumeration value="canMove.Target"/>
+ *     &lt;enumeration value="canMove.Source"/>
+ *     &lt;enumeration value="canDelete.Object"/>
+ *     &lt;enumeration value="canDeleteTree.Folder"/>
+ *     &lt;enumeration value="canSetContent.Document"/>
+ *     &lt;enumeration value="canDeleteContent.Document"/>
+ *     &lt;enumeration value="canAddToFolder.Object"/>
+ *     &lt;enumeration value="canAddToFolder.Folder"/>
+ *     &lt;enumeration value="canRemoveFromFolder.Object"/>
+ *     &lt;enumeration value="canRemoveFromFolder.Folder"/>
+ *     &lt;enumeration value="canCheckout.Document"/>
+ *     &lt;enumeration value="canCancelCheckout.Document"/>
+ *     &lt;enumeration value="canCheckin.Document"/>
+ *     &lt;enumeration value="canGetAllVersions.VersionSeries"/>
+ *     &lt;enumeration value="canGetRelationship.Object"/>
+ *     &lt;enumeration value="canAddPolicy.Object"/>
+ *     &lt;enumeration value="canAddPolicy.Policy"/>
+ *     &lt;enumeration value="canRemovePolicy.Object"/>
+ *     &lt;enumeration value="canRemovePolicy.Policy"/>
+ *     &lt;enumeration value="canGetAppliedPolicies.Object"/>
+ *     &lt;enumeration value="canGetACL.Object"/>
+ *     &lt;enumeration value="canApplyACL.Object"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "enumAllowableActionsKey", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlEnum
+public enum EnumAllowableActionsKey {
+
+    @XmlEnumValue("canGetDescendents.Folder")
+    CAN_GET_DESCENDENTS_FOLDER("canGetDescendents.Folder"),
+    @XmlEnumValue("canGetChildren.Folder")
+    CAN_GET_CHILDREN_FOLDER("canGetChildren.Folder"),
+    @XmlEnumValue("canGetParents.Folder")
+    CAN_GET_PARENTS_FOLDER("canGetParents.Folder"),
+    @XmlEnumValue("canGetFolderParent.Object")
+    CAN_GET_FOLDER_PARENT_OBJECT("canGetFolderParent.Object"),
+    @XmlEnumValue("canCreateDocument.Type")
+    CAN_CREATE_DOCUMENT_TYPE("canCreateDocument.Type"),
+    @XmlEnumValue("canCreateDocument.Folder")
+    CAN_CREATE_DOCUMENT_FOLDER("canCreateDocument.Folder"),
+    @XmlEnumValue("canCreateFolder.Type")
+    CAN_CREATE_FOLDER_TYPE("canCreateFolder.Type"),
+    @XmlEnumValue("canCreateFolder.Folder")
+    CAN_CREATE_FOLDER_FOLDER("canCreateFolder.Folder"),
+    @XmlEnumValue("canCreateRelationship.Type")
+    CAN_CREATE_RELATIONSHIP_TYPE("canCreateRelationship.Type"),
+    @XmlEnumValue("canCreateRelationship.Source")
+    CAN_CREATE_RELATIONSHIP_SOURCE("canCreateRelationship.Source"),
+    @XmlEnumValue("canCreateRelationship.Target")
+    CAN_CREATE_RELATIONSHIP_TARGET("canCreateRelationship.Target"),
+    @XmlEnumValue("canCreatePolicy.Type")
+    CAN_CREATE_POLICY_TYPE("canCreatePolicy.Type"),
+    @XmlEnumValue("canGetProperties.Object")
+    CAN_GET_PROPERTIES_OBJECT("canGetProperties.Object"),
+    @XmlEnumValue("canViewContent.Object")
+    CAN_VIEW_CONTENT_OBJECT("canViewContent.Object"),
+    @XmlEnumValue("canUpdateProperties.Object")
+    CAN_UPDATE_PROPERTIES_OBJECT("canUpdateProperties.Object"),
+    @XmlEnumValue("canMove.Object")
+    CAN_MOVE_OBJECT("canMove.Object"),
+    @XmlEnumValue("canMove.Target")
+    CAN_MOVE_TARGET("canMove.Target"),
+    @XmlEnumValue("canMove.Source")
+    CAN_MOVE_SOURCE("canMove.Source"),
+    @XmlEnumValue("canDelete.Object")
+    CAN_DELETE_OBJECT("canDelete.Object"),
+    @XmlEnumValue("canDeleteTree.Folder")
+    CAN_DELETE_TREE_FOLDER("canDeleteTree.Folder"),
+    @XmlEnumValue("canSetContent.Document")
+    CAN_SET_CONTENT_DOCUMENT("canSetContent.Document"),
+    @XmlEnumValue("canDeleteContent.Document")
+    CAN_DELETE_CONTENT_DOCUMENT("canDeleteContent.Document"),
+    @XmlEnumValue("canAddToFolder.Object")
+    CAN_ADD_TO_FOLDER_OBJECT("canAddToFolder.Object"),
+    @XmlEnumValue("canAddToFolder.Folder")
+    CAN_ADD_TO_FOLDER_FOLDER("canAddToFolder.Folder"),
+    @XmlEnumValue("canRemoveFromFolder.Object")
+    CAN_REMOVE_FROM_FOLDER_OBJECT("canRemoveFromFolder.Object"),
+    @XmlEnumValue("canRemoveFromFolder.Folder")
+    CAN_REMOVE_FROM_FOLDER_FOLDER("canRemoveFromFolder.Folder"),
+    @XmlEnumValue("canCheckout.Document")
+    CAN_CHECKOUT_DOCUMENT("canCheckout.Document"),
+    @XmlEnumValue("canCancelCheckout.Document")
+    CAN_CANCEL_CHECKOUT_DOCUMENT("canCancelCheckout.Document"),
+    @XmlEnumValue("canCheckin.Document")
+    CAN_CHECKIN_DOCUMENT("canCheckin.Document"),
+    @XmlEnumValue("canGetAllVersions.VersionSeries")
+    CAN_GET_ALL_VERSIONS_VERSION_SERIES("canGetAllVersions.VersionSeries"),
+    @XmlEnumValue("canGetRelationship.Object")
+    CAN_GET_RELATIONSHIP_OBJECT("canGetRelationship.Object"),
+    @XmlEnumValue("canAddPolicy.Object")
+    CAN_ADD_POLICY_OBJECT("canAddPolicy.Object"),
+    @XmlEnumValue("canAddPolicy.Policy")
+    CAN_ADD_POLICY_POLICY("canAddPolicy.Policy"),
+    @XmlEnumValue("canRemovePolicy.Object")
+    CAN_REMOVE_POLICY_OBJECT("canRemovePolicy.Object"),
+    @XmlEnumValue("canRemovePolicy.Policy")
+    CAN_REMOVE_POLICY_POLICY("canRemovePolicy.Policy"),
+    @XmlEnumValue("canGetAppliedPolicies.Object")
+    CAN_GET_APPLIED_POLICIES_OBJECT("canGetAppliedPolicies.Object"),
+    @XmlEnumValue("canGetACL.Object")
+    CAN_GET_ACL_OBJECT("canGetACL.Object"),
+    @XmlEnumValue("canApplyACL.Object")
+    CAN_APPLY_ACL_OBJECT("canApplyACL.Object");
+    private final String value;
+
+    EnumAllowableActionsKey(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static EnumAllowableActionsKey fromValue(String v) {
+        for (EnumAllowableActionsKey c: EnumAllowableActionsKey.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/EnumBaseObjectType.java

@@ -1,57 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for enumBaseObjectType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="enumBaseObjectType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="document"/>
- *     &lt;enumeration value="folder"/>
- *     &lt;enumeration value="relationship"/>
- *     &lt;enumeration value="policy"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "enumBaseObjectType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-@XmlEnum
-public enum EnumBaseObjectType {
-
-    @XmlEnumValue("document")
-    DOCUMENT("document"),
-    @XmlEnumValue("folder")
-    FOLDER("folder"),
-    @XmlEnumValue("relationship")
-    RELATIONSHIP("relationship"),
-    @XmlEnumValue("policy")
-    POLICY("policy");
-    private final String value;
-
-    EnumBaseObjectType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EnumBaseObjectType fromValue(String v) {
-        for (EnumBaseObjectType c: EnumBaseObjectType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/EnumBaseObjectTypeIds.java

@@ -0,0 +1,57 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for enumBaseObjectTypeIds.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="enumBaseObjectTypeIds">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="cmis:document"/>
+ *     &lt;enumeration value="cmis:folder"/>
+ *     &lt;enumeration value="cmis:relationship"/>
+ *     &lt;enumeration value="cmis:policy"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "enumBaseObjectTypeIds", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlEnum
+public enum EnumBaseObjectTypeIds {
+
+    @XmlEnumValue("cmis:document")
+    CMIS_DOCUMENT("cmis:document"),
+    @XmlEnumValue("cmis:folder")
+    CMIS_FOLDER("cmis:folder"),
+    @XmlEnumValue("cmis:relationship")
+    CMIS_RELATIONSHIP("cmis:relationship"),
+    @XmlEnumValue("cmis:policy")
+    CMIS_POLICY("cmis:policy");
+    private final String value;
+
+    EnumBaseObjectTypeIds(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static EnumBaseObjectTypeIds fromValue(String v) {
+        for (EnumBaseObjectTypeIds c: EnumBaseObjectTypeIds.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/EnumBasicPermissions.java

@@ -0,0 +1,57 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for enumBasicPermissions.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="enumBasicPermissions">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="cmis:read"/>
+ *     &lt;enumeration value="cmis:write"/>
+ *     &lt;enumeration value="cmis:delete"/>
+ *     &lt;enumeration value="cmis:all"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "enumBasicPermissions", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlEnum
+public enum EnumBasicPermissions {
+
+    @XmlEnumValue("cmis:read")
+    CMIS_READ("cmis:read"),
+    @XmlEnumValue("cmis:write")
+    CMIS_WRITE("cmis:write"),
+    @XmlEnumValue("cmis:delete")
+    CMIS_DELETE("cmis:delete"),
+    @XmlEnumValue("cmis:all")
+    CMIS_ALL("cmis:all");
+    private final String value;
+
+    EnumBasicPermissions(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static EnumBasicPermissions fromValue(String v) {
+        for (EnumBasicPermissions c: EnumBasicPermissions.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/EnumBasicPrivileges.java

@@ -1,54 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for enumBasicPrivileges.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="enumBasicPrivileges">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="CMIS.BasicPermission.Read"/>
- *     &lt;enumeration value="CMIS.BasicPermission.Write"/>
- *     &lt;enumeration value="CMIS.BasicPermission.All"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "enumBasicPrivileges", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-@XmlEnum
-public enum EnumBasicPrivileges {
-
-    @XmlEnumValue("CMIS.BasicPermission.Read")
-    CMIS_BASIC_PERMISSION_READ("CMIS.BasicPermission.Read"),
-    @XmlEnumValue("CMIS.BasicPermission.Write")
-    CMIS_BASIC_PERMISSION_WRITE("CMIS.BasicPermission.Write"),
-    @XmlEnumValue("CMIS.BasicPermission.All")
-    CMIS_BASIC_PERMISSION_ALL("CMIS.BasicPermission.All");
-    private final String value;
-
-    EnumBasicPrivileges(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EnumBasicPrivileges fromValue(String v) {
-        for (EnumBasicPrivileges c: EnumBasicPrivileges.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/EnumCapabilityACL.java

@@ -15,8 +15,8 @@ import javax.xml.bind.annotation.XmlType;
  * <simpleType name="enumCapabilityACL">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
  *     <enumeration value="none"/>
- *     <enumeration value="read"/>
- *     <enumeration value="set"/>
+ *     <enumeration value="discover"/>
+ *     <enumeration value="manage"/>
  *   </restriction>
  * </simpleType>
  * </pre>
@@ -28,10 +28,10 @@ public enum EnumCapabilityACL {
 
     @XmlEnumValue("none")
     NONE("none"),
-    @XmlEnumValue("read")
-    READ("read"),
-    @XmlEnumValue("set")
-    SET("set");
+    @XmlEnumValue("discover")
+    DISCOVER("discover"),
+    @XmlEnumValue("manage")
+    MANAGE("manage");
     private final String value;
 
     EnumCapabilityACL(String v) {

source/generated/org/alfresco/repo/cmis/ws/EnumCapabilityChanges.java

@@ -15,12 +15,8 @@ import javax.xml.bind.annotation.XmlType;
  * <simpleType name="enumCapabilityChanges">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
  *     <enumeration value="none"/>
- *     <enumeration value="includeACL"/>
- *     <enumeration value="includeProperties"/>
- *     <enumeration value="includeFolders"/>
- *     <enumeration value="includeDocuments"/>
- *     <enumeration value="includeRelationships"/>
- *     <enumeration value="includePolicies"/>
+ *     <enumeration value="objectIdsOnly"/>
+ *     <enumeration value="properties"/>
  *     <enumeration value="all"/>
  *   </restriction>
  * </simpleType>
@@ -33,18 +29,10 @@ public enum EnumCapabilityChanges {
 
     @XmlEnumValue("none")
     NONE("none"),
-    @XmlEnumValue("includeACL")
-    INCLUDE_ACL("includeACL"),
-    @XmlEnumValue("includeProperties")
-    INCLUDE_PROPERTIES("includeProperties"),
-    @XmlEnumValue("includeFolders")
-    INCLUDE_FOLDERS("includeFolders"),
-    @XmlEnumValue("includeDocuments")
-    INCLUDE_DOCUMENTS("includeDocuments"),
-    @XmlEnumValue("includeRelationships")
-    INCLUDE_RELATIONSHIPS("includeRelationships"),
-    @XmlEnumValue("includePolicies")
-    INCLUDE_POLICIES("includePolicies"),
+    @XmlEnumValue("objectIdsOnly")
+    OBJECT_IDS_ONLY("objectIdsOnly"),
+    @XmlEnumValue("properties")
+    PROPERTIES("properties"),
     @XmlEnumValue("all")
     ALL("all");
     private final String value;

source/generated/org/alfresco/repo/cmis/ws/EnumCapabilityContentStreamUpdates.java

@@ -0,0 +1,51 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for enumCapabilityContentStreamUpdates.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="enumCapabilityContentStreamUpdates">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="anytime"/>
+ *     &lt;enumeration value="pwc-only"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "enumCapabilityContentStreamUpdates", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlEnum
+public enum EnumCapabilityContentStreamUpdates {
+
+    @XmlEnumValue("anytime")
+    ANYTIME("anytime"),
+    @XmlEnumValue("pwc-only")
+    PWC_ONLY("pwc-only");
+    private final String value;
+
+    EnumCapabilityContentStreamUpdates(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static EnumCapabilityContentStreamUpdates fromValue(String v) {
+        for (EnumCapabilityContentStreamUpdates c: EnumCapabilityContentStreamUpdates.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/EnumCapabilityRendition.java

@@ -0,0 +1,51 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for enumCapabilityRendition.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="enumCapabilityRendition">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="none"/>
+ *     &lt;enumeration value="read"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "enumCapabilityRendition", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlEnum
+public enum EnumCapabilityRendition {
+
+    @XmlEnumValue("none")
+    NONE("none"),
+    @XmlEnumValue("read")
+    READ("read");
+    private final String value;
+
+    EnumCapabilityRendition(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static EnumCapabilityRendition fromValue(String v) {
+        for (EnumCapabilityRendition c: EnumCapabilityRendition.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/EnumCollectionType.java

@@ -1,69 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for enumCollectionType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="enumCollectionType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="rootchildren"/>
- *     &lt;enumeration value="rootdescendants"/>
- *     &lt;enumeration value="unfiled"/>
- *     &lt;enumeration value="checkedout"/>
- *     &lt;enumeration value="typeschildren"/>
- *     &lt;enumeration value="typesdescendants"/>
- *     &lt;enumeration value="query"/>
- *     &lt;enumeration value="changes"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "enumCollectionType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-@XmlEnum
-public enum EnumCollectionType {
-
-    @XmlEnumValue("rootchildren")
-    ROOTCHILDREN("rootchildren"),
-    @XmlEnumValue("rootdescendants")
-    ROOTDESCENDANTS("rootdescendants"),
-    @XmlEnumValue("unfiled")
-    UNFILED("unfiled"),
-    @XmlEnumValue("checkedout")
-    CHECKEDOUT("checkedout"),
-    @XmlEnumValue("typeschildren")
-    TYPESCHILDREN("typeschildren"),
-    @XmlEnumValue("typesdescendants")
-    TYPESDESCENDANTS("typesdescendants"),
-    @XmlEnumValue("query")
-    QUERY("query"),
-    @XmlEnumValue("changes")
-    CHANGES("changes");
-    private final String value;
-
-    EnumCollectionType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EnumCollectionType fromValue(String v) {
-        for (EnumCollectionType c: EnumCollectionType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/EnumObjectType.java

@@ -1,57 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for enumObjectType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="enumObjectType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="document"/>
- *     &lt;enumeration value="folder"/>
- *     &lt;enumeration value="relationship"/>
- *     &lt;enumeration value="policy"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "enumObjectType", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-@XmlEnum
-public enum EnumObjectType {
-
-    @XmlEnumValue("document")
-    DOCUMENT("document"),
-    @XmlEnumValue("folder")
-    FOLDER("folder"),
-    @XmlEnumValue("relationship")
-    RELATIONSHIP("relationship"),
-    @XmlEnumValue("policy")
-    POLICY("policy");
-    private final String value;
-
-    EnumObjectType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EnumObjectType fromValue(String v) {
-        for (EnumObjectType c: EnumObjectType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/EnumPropertiesBase.java

@@ -14,16 +14,15 @@ import javax.xml.bind.annotation.XmlType;
  * <pre>
  * &lt;simpleType name="enumPropertiesBase">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="ObjectId"/>
- *     &lt;enumeration value="Uri"/>
- *     &lt;enumeration value="ObjectTypeId"/>
- *     &lt;enumeration value="BaseTypeId"/>
- *     &lt;enumeration value="CreatedBy"/>
- *     &lt;enumeration value="CreationDate"/>
- *     &lt;enumeration value="LastModifiedBy"/>
- *     &lt;enumeration value="LastModificationDate"/>
- *     &lt;enumeration value="ChangeToken"/>
- *     &lt;enumeration value="Name"/>
+ *     &lt;enumeration value="cmis:Name"/>
+ *     &lt;enumeration value="cmis:ObjectId"/>
+ *     &lt;enumeration value="cmis:ObjectTypeId"/>
+ *     &lt;enumeration value="cmis:BaseTypeId"/>
+ *     &lt;enumeration value="cmis:CreatedBy"/>
+ *     &lt;enumeration value="cmis:CreationDate"/>
+ *     &lt;enumeration value="cmis:LastModifiedBy"/>
+ *     &lt;enumeration value="cmis:LastModificationDate"/>
+ *     &lt;enumeration value="cmis:ChangeToken"/>
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
@@ -33,26 +32,24 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum EnumPropertiesBase {
 
-    @XmlEnumValue("ObjectId")
-    OBJECT_ID("ObjectId"),
-    @XmlEnumValue("Uri")
-    URI("Uri"),
-    @XmlEnumValue("ObjectTypeId")
-    OBJECT_TYPE_ID("ObjectTypeId"),
-    @XmlEnumValue("BaseTypeId")
-    BASE_TYPE_ID("BaseTypeId"),
-    @XmlEnumValue("CreatedBy")
-    CREATED_BY("CreatedBy"),
-    @XmlEnumValue("CreationDate")
-    CREATION_DATE("CreationDate"),
-    @XmlEnumValue("LastModifiedBy")
-    LAST_MODIFIED_BY("LastModifiedBy"),
-    @XmlEnumValue("LastModificationDate")
-    LAST_MODIFICATION_DATE("LastModificationDate"),
-    @XmlEnumValue("ChangeToken")
-    CHANGE_TOKEN("ChangeToken"),
-    @XmlEnumValue("Name")
-    NAME("Name");
+    @XmlEnumValue("cmis:Name")
+    CMIS_NAME("cmis:Name"),
+    @XmlEnumValue("cmis:ObjectId")
+    CMIS_OBJECT_ID("cmis:ObjectId"),
+    @XmlEnumValue("cmis:ObjectTypeId")
+    CMIS_OBJECT_TYPE_ID("cmis:ObjectTypeId"),
+    @XmlEnumValue("cmis:BaseTypeId")
+    CMIS_BASE_TYPE_ID("cmis:BaseTypeId"),
+    @XmlEnumValue("cmis:CreatedBy")
+    CMIS_CREATED_BY("cmis:CreatedBy"),
+    @XmlEnumValue("cmis:CreationDate")
+    CMIS_CREATION_DATE("cmis:CreationDate"),
+    @XmlEnumValue("cmis:LastModifiedBy")
+    CMIS_LAST_MODIFIED_BY("cmis:LastModifiedBy"),
+    @XmlEnumValue("cmis:LastModificationDate")
+    CMIS_LAST_MODIFICATION_DATE("cmis:LastModificationDate"),
+    @XmlEnumValue("cmis:ChangeToken")
+    CMIS_CHANGE_TOKEN("cmis:ChangeToken");
     private final String value;
 
     EnumPropertiesBase(String v) {

source/generated/org/alfresco/repo/cmis/ws/EnumPropertiesDocument.java

@@ -14,31 +14,20 @@ import javax.xml.bind.annotation.XmlType;
  * <pre>
  * &lt;simpleType name="enumPropertiesDocument">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Name"/>
- *     &lt;enumeration value="ObjectId"/>
- *     &lt;enumeration value="BaseTypeId"/>
- *     &lt;enumeration value="Uri"/>
- *     &lt;enumeration value="ObjectTypeId"/>
- *     &lt;enumeration value="CreatedBy"/>
- *     &lt;enumeration value="CreationDate"/>
- *     &lt;enumeration value="LastModifiedBy"/>
- *     &lt;enumeration value="LastModificationDate"/>
- *     &lt;enumeration value="ChangeToken"/>
- *     &lt;enumeration value="IsImmutable"/>
- *     &lt;enumeration value="IsLatestVersion"/>
- *     &lt;enumeration value="IsMajorVersion"/>
- *     &lt;enumeration value="IsLatestMajorVersion"/>
- *     &lt;enumeration value="VersionLabel"/>
- *     &lt;enumeration value="VersionSeriesId"/>
- *     &lt;enumeration value="IsVersionSeriesCheckedOut"/>
- *     &lt;enumeration value="VersionSeriesCheckedOutBy"/>
- *     &lt;enumeration value="VersionSeriesCheckedOutId"/>
- *     &lt;enumeration value="CheckinComment"/>
- *     &lt;enumeration value="ContentStreamAllowed"/>
- *     &lt;enumeration value="ContentStreamLength"/>
- *     &lt;enumeration value="ContentStreamMimeType"/>
- *     &lt;enumeration value="ContentStreamFilename"/>
- *     &lt;enumeration value="ContentStreamUri"/>
+ *     &lt;enumeration value="cmis:IsImmutable"/>
+ *     &lt;enumeration value="cmis:IsLatestVersion"/>
+ *     &lt;enumeration value="cmis:IsMajorVersion"/>
+ *     &lt;enumeration value="cmis:IsLatestMajorVersion"/>
+ *     &lt;enumeration value="cmis:VersionLabel"/>
+ *     &lt;enumeration value="cmis:VersionSeriesId"/>
+ *     &lt;enumeration value="cmis:IsVersionSeriesCheckedOut"/>
+ *     &lt;enumeration value="cmis:VersionSeriesCheckedOutBy"/>
+ *     &lt;enumeration value="cmis:VersionSeriesCheckedOutId"/>
+ *     &lt;enumeration value="cmis:CheckinComment"/>
+ *     &lt;enumeration value="cmis:ContentStreamLength"/>
+ *     &lt;enumeration value="cmis:ContentStreamMimeType"/>
+ *     &lt;enumeration value="cmis:ContentStreamFileName"/>
+ *     &lt;enumeration value="cmis:ContentStreamId"/>
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
@@ -48,56 +37,34 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum EnumPropertiesDocument {
 
-    @XmlEnumValue("Name")
-    NAME("Name"),
-    @XmlEnumValue("ObjectId")
-    OBJECT_ID("ObjectId"),
-    @XmlEnumValue("BaseTypeId")
-    BASE_TYPE_ID("BaseTypeId"),
-    @XmlEnumValue("Uri")
-    URI("Uri"),
-    @XmlEnumValue("ObjectTypeId")
-    OBJECT_TYPE_ID("ObjectTypeId"),
-    @XmlEnumValue("CreatedBy")
-    CREATED_BY("CreatedBy"),
-    @XmlEnumValue("CreationDate")
-    CREATION_DATE("CreationDate"),
-    @XmlEnumValue("LastModifiedBy")
-    LAST_MODIFIED_BY("LastModifiedBy"),
-    @XmlEnumValue("LastModificationDate")
-    LAST_MODIFICATION_DATE("LastModificationDate"),
-    @XmlEnumValue("ChangeToken")
-    CHANGE_TOKEN("ChangeToken"),
-    @XmlEnumValue("IsImmutable")
-    IS_IMMUTABLE("IsImmutable"),
-    @XmlEnumValue("IsLatestVersion")
-    IS_LATEST_VERSION("IsLatestVersion"),
-    @XmlEnumValue("IsMajorVersion")
-    IS_MAJOR_VERSION("IsMajorVersion"),
-    @XmlEnumValue("IsLatestMajorVersion")
-    IS_LATEST_MAJOR_VERSION("IsLatestMajorVersion"),
-    @XmlEnumValue("VersionLabel")
-    VERSION_LABEL("VersionLabel"),
-    @XmlEnumValue("VersionSeriesId")
-    VERSION_SERIES_ID("VersionSeriesId"),
-    @XmlEnumValue("IsVersionSeriesCheckedOut")
-    IS_VERSION_SERIES_CHECKED_OUT("IsVersionSeriesCheckedOut"),
-    @XmlEnumValue("VersionSeriesCheckedOutBy")
-    VERSION_SERIES_CHECKED_OUT_BY("VersionSeriesCheckedOutBy"),
-    @XmlEnumValue("VersionSeriesCheckedOutId")
-    VERSION_SERIES_CHECKED_OUT_ID("VersionSeriesCheckedOutId"),
-    @XmlEnumValue("CheckinComment")
-    CHECKIN_COMMENT("CheckinComment"),
-    @XmlEnumValue("ContentStreamAllowed")
-    CONTENT_STREAM_ALLOWED("ContentStreamAllowed"),
-    @XmlEnumValue("ContentStreamLength")
-    CONTENT_STREAM_LENGTH("ContentStreamLength"),
-    @XmlEnumValue("ContentStreamMimeType")
-    CONTENT_STREAM_MIME_TYPE("ContentStreamMimeType"),
-    @XmlEnumValue("ContentStreamFilename")
-    CONTENT_STREAM_FILENAME("ContentStreamFilename"),
-    @XmlEnumValue("ContentStreamUri")
-    CONTENT_STREAM_URI("ContentStreamUri");
+    @XmlEnumValue("cmis:IsImmutable")
+    CMIS_IS_IMMUTABLE("cmis:IsImmutable"),
+    @XmlEnumValue("cmis:IsLatestVersion")
+    CMIS_IS_LATEST_VERSION("cmis:IsLatestVersion"),
+    @XmlEnumValue("cmis:IsMajorVersion")
+    CMIS_IS_MAJOR_VERSION("cmis:IsMajorVersion"),
+    @XmlEnumValue("cmis:IsLatestMajorVersion")
+    CMIS_IS_LATEST_MAJOR_VERSION("cmis:IsLatestMajorVersion"),
+    @XmlEnumValue("cmis:VersionLabel")
+    CMIS_VERSION_LABEL("cmis:VersionLabel"),
+    @XmlEnumValue("cmis:VersionSeriesId")
+    CMIS_VERSION_SERIES_ID("cmis:VersionSeriesId"),
+    @XmlEnumValue("cmis:IsVersionSeriesCheckedOut")
+    CMIS_IS_VERSION_SERIES_CHECKED_OUT("cmis:IsVersionSeriesCheckedOut"),
+    @XmlEnumValue("cmis:VersionSeriesCheckedOutBy")
+    CMIS_VERSION_SERIES_CHECKED_OUT_BY("cmis:VersionSeriesCheckedOutBy"),
+    @XmlEnumValue("cmis:VersionSeriesCheckedOutId")
+    CMIS_VERSION_SERIES_CHECKED_OUT_ID("cmis:VersionSeriesCheckedOutId"),
+    @XmlEnumValue("cmis:CheckinComment")
+    CMIS_CHECKIN_COMMENT("cmis:CheckinComment"),
+    @XmlEnumValue("cmis:ContentStreamLength")
+    CMIS_CONTENT_STREAM_LENGTH("cmis:ContentStreamLength"),
+    @XmlEnumValue("cmis:ContentStreamMimeType")
+    CMIS_CONTENT_STREAM_MIME_TYPE("cmis:ContentStreamMimeType"),
+    @XmlEnumValue("cmis:ContentStreamFileName")
+    CMIS_CONTENT_STREAM_FILE_NAME("cmis:ContentStreamFileName"),
+    @XmlEnumValue("cmis:ContentStreamId")
+    CMIS_CONTENT_STREAM_ID("cmis:ContentStreamId");
     private final String value;
 
     EnumPropertiesDocument(String v) {

source/generated/org/alfresco/repo/cmis/ws/EnumPropertiesFolder.java

@@ -14,18 +14,8 @@ import javax.xml.bind.annotation.XmlType;
  * <pre>
  * &lt;simpleType name="enumPropertiesFolder">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Name"/>
- *     &lt;enumeration value="ObjectId"/>
- *     &lt;enumeration value="BaseTypeId"/>
- *     &lt;enumeration value="Uri"/>
- *     &lt;enumeration value="ObjectTypeId"/>
- *     &lt;enumeration value="CreatedBy"/>
- *     &lt;enumeration value="CreationDate"/>
- *     &lt;enumeration value="LastModifiedBy"/>
- *     &lt;enumeration value="LastModificationDate"/>
- *     &lt;enumeration value="ChangeToken"/>
- *     &lt;enumeration value="ParentId"/>
- *     &lt;enumeration value="AllowedChildObjectTypeIds"/>
+ *     &lt;enumeration value="cmis:ParentId"/>
+ *     &lt;enumeration value="cmis:AllowedChildObjectTypeNames"/>
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
@@ -35,30 +25,10 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum EnumPropertiesFolder {
 
-    @XmlEnumValue("Name")
-    NAME("Name"),
-    @XmlEnumValue("ObjectId")
-    OBJECT_ID("ObjectId"),
-    @XmlEnumValue("BaseTypeId")
-    BASE_TYPE_ID("BaseTypeId"),
-    @XmlEnumValue("Uri")
-    URI("Uri"),
-    @XmlEnumValue("ObjectTypeId")
-    OBJECT_TYPE_ID("ObjectTypeId"),
-    @XmlEnumValue("CreatedBy")
-    CREATED_BY("CreatedBy"),
-    @XmlEnumValue("CreationDate")
-    CREATION_DATE("CreationDate"),
-    @XmlEnumValue("LastModifiedBy")
-    LAST_MODIFIED_BY("LastModifiedBy"),
-    @XmlEnumValue("LastModificationDate")
-    LAST_MODIFICATION_DATE("LastModificationDate"),
-    @XmlEnumValue("ChangeToken")
-    CHANGE_TOKEN("ChangeToken"),
-    @XmlEnumValue("ParentId")
-    PARENT_ID("ParentId"),
-    @XmlEnumValue("AllowedChildObjectTypeIds")
-    ALLOWED_CHILD_OBJECT_TYPE_IDS("AllowedChildObjectTypeIds");
+    @XmlEnumValue("cmis:ParentId")
+    CMIS_PARENT_ID("cmis:ParentId"),
+    @XmlEnumValue("cmis:AllowedChildObjectTypeNames")
+    CMIS_ALLOWED_CHILD_OBJECT_TYPE_NAMES("cmis:AllowedChildObjectTypeNames");
     private final String value;
 
     EnumPropertiesFolder(String v) {

source/generated/org/alfresco/repo/cmis/ws/EnumPropertiesPolicy.java

@@ -14,18 +14,7 @@ import javax.xml.bind.annotation.XmlType;
  * <pre>
  * &lt;simpleType name="enumPropertiesPolicy">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Name"/>
- *     &lt;enumeration value="ObjectId"/>
- *     &lt;enumeration value="Uri"/>
- *     &lt;enumeration value="ObjectTypeId"/>
- *     &lt;enumeration value="BaseTypeId"/>
- *     &lt;enumeration value="CreatedBy"/>
- *     &lt;enumeration value="CreationDate"/>
- *     &lt;enumeration value="LastModifiedBy"/>
- *     &lt;enumeration value="LastModificationDate"/>
- *     &lt;enumeration value="ChangeToken"/>
- *     &lt;enumeration value="PolicyName"/>
- *     &lt;enumeration value="PolicyText"/>
+ *     &lt;enumeration value="cmis:PolicyText"/>
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
@@ -35,30 +24,8 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum EnumPropertiesPolicy {
 
-    @XmlEnumValue("Name")
-    NAME("Name"),
-    @XmlEnumValue("ObjectId")
-    OBJECT_ID("ObjectId"),
-    @XmlEnumValue("Uri")
-    URI("Uri"),
-    @XmlEnumValue("ObjectTypeId")
-    OBJECT_TYPE_ID("ObjectTypeId"),
-    @XmlEnumValue("BaseTypeId")
-    BASE_TYPE_ID("BaseTypeId"),
-    @XmlEnumValue("CreatedBy")
-    CREATED_BY("CreatedBy"),
-    @XmlEnumValue("CreationDate")
-    CREATION_DATE("CreationDate"),
-    @XmlEnumValue("LastModifiedBy")
-    LAST_MODIFIED_BY("LastModifiedBy"),
-    @XmlEnumValue("LastModificationDate")
-    LAST_MODIFICATION_DATE("LastModificationDate"),
-    @XmlEnumValue("ChangeToken")
-    CHANGE_TOKEN("ChangeToken"),
-    @XmlEnumValue("PolicyName")
-    POLICY_NAME("PolicyName"),
-    @XmlEnumValue("PolicyText")
-    POLICY_TEXT("PolicyText");
+    @XmlEnumValue("cmis:PolicyText")
+    CMIS_POLICY_TEXT("cmis:PolicyText");
     private final String value;
 
     EnumPropertiesPolicy(String v) {

source/generated/org/alfresco/repo/cmis/ws/EnumPropertiesRelationship.java

@@ -14,18 +14,8 @@ import javax.xml.bind.annotation.XmlType;
  * <pre>
  * &lt;simpleType name="enumPropertiesRelationship">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Name"/>
- *     &lt;enumeration value="ObjectId"/>
- *     &lt;enumeration value="Uri"/>
- *     &lt;enumeration value="ObjectTypeId"/>
- *     &lt;enumeration value="BaseTypeId"/>
- *     &lt;enumeration value="CreatedBy"/>
- *     &lt;enumeration value="CreationDate"/>
- *     &lt;enumeration value="LastModifiedBy"/>
- *     &lt;enumeration value="LastModificationDate"/>
- *     &lt;enumeration value="ChangeToken"/>
- *     &lt;enumeration value="SourceId"/>
- *     &lt;enumeration value="TargetId"/>
+ *     &lt;enumeration value="cmis:SourceId"/>
+ *     &lt;enumeration value="cmis:TargetId"/>
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
@@ -35,30 +25,10 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum EnumPropertiesRelationship {
 
-    @XmlEnumValue("Name")
-    NAME("Name"),
-    @XmlEnumValue("ObjectId")
-    OBJECT_ID("ObjectId"),
-    @XmlEnumValue("Uri")
-    URI("Uri"),
-    @XmlEnumValue("ObjectTypeId")
-    OBJECT_TYPE_ID("ObjectTypeId"),
-    @XmlEnumValue("BaseTypeId")
-    BASE_TYPE_ID("BaseTypeId"),
-    @XmlEnumValue("CreatedBy")
-    CREATED_BY("CreatedBy"),
-    @XmlEnumValue("CreationDate")
-    CREATION_DATE("CreationDate"),
-    @XmlEnumValue("LastModifiedBy")
-    LAST_MODIFIED_BY("LastModifiedBy"),
-    @XmlEnumValue("LastModificationDate")
-    LAST_MODIFICATION_DATE("LastModificationDate"),
-    @XmlEnumValue("ChangeToken")
-    CHANGE_TOKEN("ChangeToken"),
-    @XmlEnumValue("SourceId")
-    SOURCE_ID("SourceId"),
-    @XmlEnumValue("TargetId")
-    TARGET_ID("TargetId");
+    @XmlEnumValue("cmis:SourceId")
+    CMIS_SOURCE_ID("cmis:SourceId"),
+    @XmlEnumValue("cmis:TargetId")
+    CMIS_TARGET_ID("cmis:TargetId");
     private final String value;
 
     EnumPropertiesRelationship(String v) {

source/generated/org/alfresco/repo/cmis/ws/EnumPropertyType.java

@@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <enumeration value="datetime"/>
  *     <enumeration value="decimal"/>
  *     <enumeration value="html"/>
+ *     <enumeration value="xhtml"/>
  *     <enumeration value="string"/>
  *     <enumeration value="uri"/>
  *     <enumeration value="xml"/>
@@ -44,6 +45,8 @@ public enum EnumPropertyType {
     DECIMAL("decimal"),
     @XmlEnumValue("html")
     HTML("html"),
+    @XmlEnumValue("xhtml")
+    XHTML("xhtml"),
     @XmlEnumValue("string")
     STRING("string"),
     @XmlEnumValue("uri")

source/generated/org/alfresco/repo/cmis/ws/EnumRenditionKind.java

@@ -7,28 +7,28 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for enumRestOutputHeaders.
+ * <p>Java class for enumRenditionKind.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
  * <pre>
- * &lt;simpleType name="enumRestOutputHeaders">
+ * &lt;simpleType name="enumRenditionKind">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="contentCopied"/>
+ *     &lt;enumeration value="cmis:thumbnail"/>
  *   &lt;/restriction>
  * &lt;/simpleType>
  * </pre>
  * 
  */
-@XmlType(name = "enumRestOutputHeaders", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlType(name = "enumRenditionKind", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
 @XmlEnum
-public enum EnumRestOutputHeaders {
+public enum EnumRenditionKind {
 
-    @XmlEnumValue("contentCopied")
-    CONTENT_COPIED("contentCopied");
+    @XmlEnumValue("cmis:thumbnail")
+    CMIS_THUMBNAIL("cmis:thumbnail");
     private final String value;
 
-    EnumRestOutputHeaders(String v) {
+    EnumRenditionKind(String v) {
         value = v;
     }
 
@@ -36,8 +36,8 @@ public enum EnumRestOutputHeaders {
         return value;
     }
 
-    public static EnumRestOutputHeaders fromValue(String v) {
-        for (EnumRestOutputHeaders c: EnumRestOutputHeaders.values()) {
+    public static EnumRenditionKind fromValue(String v) {
+        for (EnumRenditionKind c: EnumRenditionKind.values()) {
             if (c.value.equals(v)) {
                 return c;
             }

source/generated/org/alfresco/repo/cmis/ws/EnumRestArguments.java

@@ -1,132 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for enumRestArguments.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="enumRestArguments">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="childTypes"/>
- *     &lt;enumeration value="continueOnFailure"/>
- *     &lt;enumeration value="checkin"/>
- *     &lt;enumeration value="checkinComment"/>
- *     &lt;enumeration value="depth"/>
- *     &lt;enumeration value="direction"/>
- *     &lt;enumeration value="filter"/>
- *     &lt;enumeration value="folderByPath"/>
- *     &lt;enumeration value="folderId"/>
- *     &lt;enumeration value="includeAllowableActions"/>
- *     &lt;enumeration value="includePropertyDefinitions"/>
- *     &lt;enumeration value="includeRelationships"/>
- *     &lt;enumeration value="includeSubrelationshipTypes"/>
- *     &lt;enumeration value="length"/>
- *     &lt;enumeration value="major"/>
- *     &lt;enumeration value="majorVersion"/>
- *     &lt;enumeration value="maxItems"/>
- *     &lt;enumeration value="offset"/>
- *     &lt;enumeration value="removeFrom"/>
- *     &lt;enumeration value="relationshipType"/>
- *     &lt;enumeration value="repositoryId"/>
- *     &lt;enumeration value="returnToRoot"/>
- *     &lt;enumeration value="returnVersion"/>
- *     &lt;enumeration value="skipCount"/>
- *     &lt;enumeration value="thisVersion"/>
- *     &lt;enumeration value="typeId"/>
- *     &lt;enumeration value="types"/>
- *     &lt;enumeration value="unfileMultiFiledDocuments"/>
- *     &lt;enumeration value="versioningState"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "enumRestArguments", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-@XmlEnum
-public enum EnumRestArguments {
-
-    @XmlEnumValue("childTypes")
-    CHILD_TYPES("childTypes"),
-    @XmlEnumValue("continueOnFailure")
-    CONTINUE_ON_FAILURE("continueOnFailure"),
-    @XmlEnumValue("checkin")
-    CHECKIN("checkin"),
-    @XmlEnumValue("checkinComment")
-    CHECKIN_COMMENT("checkinComment"),
-    @XmlEnumValue("depth")
-    DEPTH("depth"),
-    @XmlEnumValue("direction")
-    DIRECTION("direction"),
-    @XmlEnumValue("filter")
-    FILTER("filter"),
-    @XmlEnumValue("folderByPath")
-    FOLDER_BY_PATH("folderByPath"),
-    @XmlEnumValue("folderId")
-    FOLDER_ID("folderId"),
-    @XmlEnumValue("includeAllowableActions")
-    INCLUDE_ALLOWABLE_ACTIONS("includeAllowableActions"),
-    @XmlEnumValue("includePropertyDefinitions")
-    INCLUDE_PROPERTY_DEFINITIONS("includePropertyDefinitions"),
-    @XmlEnumValue("includeRelationships")
-    INCLUDE_RELATIONSHIPS("includeRelationships"),
-    @XmlEnumValue("includeSubrelationshipTypes")
-    INCLUDE_SUBRELATIONSHIP_TYPES("includeSubrelationshipTypes"),
-    @XmlEnumValue("length")
-    LENGTH("length"),
-    @XmlEnumValue("major")
-    MAJOR("major"),
-    @XmlEnumValue("majorVersion")
-    MAJOR_VERSION("majorVersion"),
-    @XmlEnumValue("maxItems")
-    MAX_ITEMS("maxItems"),
-    @XmlEnumValue("offset")
-    OFFSET("offset"),
-    @XmlEnumValue("removeFrom")
-    REMOVE_FROM("removeFrom"),
-    @XmlEnumValue("relationshipType")
-    RELATIONSHIP_TYPE("relationshipType"),
-    @XmlEnumValue("repositoryId")
-    REPOSITORY_ID("repositoryId"),
-    @XmlEnumValue("returnToRoot")
-    RETURN_TO_ROOT("returnToRoot"),
-    @XmlEnumValue("returnVersion")
-    RETURN_VERSION("returnVersion"),
-    @XmlEnumValue("skipCount")
-    SKIP_COUNT("skipCount"),
-    @XmlEnumValue("thisVersion")
-    THIS_VERSION("thisVersion"),
-    @XmlEnumValue("typeId")
-    TYPE_ID("typeId"),
-    @XmlEnumValue("types")
-    TYPES("types"),
-    @XmlEnumValue("unfileMultiFiledDocuments")
-    UNFILE_MULTI_FILED_DOCUMENTS("unfileMultiFiledDocuments"),
-    @XmlEnumValue("versioningState")
-    VERSIONING_STATE("versioningState");
-    private final String value;
-
-    EnumRestArguments(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EnumRestArguments fromValue(String v) {
-        for (EnumRestArguments c: EnumRestArguments.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/EnumServiceException.java

@@ -17,12 +17,9 @@ import javax.xml.bind.annotation.XmlType;
  *     <enumeration value="constraint"/>
  *     <enumeration value="contentAlreadyExists"/>
  *     <enumeration value="filterNotValid"/>
- *     <enumeration value="folderNotValid"/>
  *     <enumeration value="invalidArgument"/>
- *     <enumeration value="notInFolder"/>
- *     <enumeration value="objectNotFound"/>
- *     <enumeration value="offset"/>
  *     <enumeration value="notSupported"/>
+ *     <enumeration value="objectNotFound"/>
  *     <enumeration value="permissionDenied"/>
  *     <enumeration value="runtime"/>
  *     <enumeration value="storage"/>
@@ -45,18 +42,12 @@ public enum EnumServiceException {
     CONTENT_ALREADY_EXISTS("contentAlreadyExists"),
     @XmlEnumValue("filterNotValid")
     FILTER_NOT_VALID("filterNotValid"),
-    @XmlEnumValue("folderNotValid")
-    FOLDER_NOT_VALID("folderNotValid"),
     @XmlEnumValue("invalidArgument")
     INVALID_ARGUMENT("invalidArgument"),
-    @XmlEnumValue("notInFolder")
-    NOT_IN_FOLDER("notInFolder"),
-    @XmlEnumValue("objectNotFound")
-    OBJECT_NOT_FOUND("objectNotFound"),
-    @XmlEnumValue("offset")
-    OFFSET("offset"),
     @XmlEnumValue("notSupported")
     NOT_SUPPORTED("notSupported"),
+    @XmlEnumValue("objectNotFound")
+    OBJECT_NOT_FOUND("objectNotFound"),
     @XmlEnumValue("permissionDenied")
     PERMISSION_DENIED("permissionDenied"),
     @XmlEnumValue("runtime")

source/generated/org/alfresco/repo/cmis/ws/EnumTypesOfFileableObjects.java

@@ -1,57 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for enumTypesOfFileableObjects.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="enumTypesOfFileableObjects">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="documents"/>
- *     &lt;enumeration value="folders"/>
- *     &lt;enumeration value="policies"/>
- *     &lt;enumeration value="any"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "enumTypesOfFileableObjects", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-@XmlEnum
-public enum EnumTypesOfFileableObjects {
-
-    @XmlEnumValue("documents")
-    DOCUMENTS("documents"),
-    @XmlEnumValue("folders")
-    FOLDERS("folders"),
-    @XmlEnumValue("policies")
-    POLICIES("policies"),
-    @XmlEnumValue("any")
-    ANY("any");
-    private final String value;
-
-    EnumTypesOfFileableObjects(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EnumTypesOfFileableObjects fromValue(String v) {
-        for (EnumTypesOfFileableObjects c: EnumTypesOfFileableObjects.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/EnumUnfileObject.java

@@ -7,12 +7,12 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for enumUnfileNonfolderObjects.
+ * <p>Java class for enumUnfileObject.
  * 
  * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
  * <pre>
- * &lt;simpleType name="enumUnfileNonfolderObjects">
+ * &lt;simpleType name="enumUnfileObject">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
  *     &lt;enumeration value="unfile"/>
  *     &lt;enumeration value="deletesinglefiled"/>
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlType;
  * </pre>
  * 
  */
-@XmlType(name = "enumUnfileNonfolderObjects", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
+@XmlType(name = "enumUnfileObject", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
 @XmlEnum
-public enum EnumUnfileNonfolderObjects {
+public enum EnumUnfileObject {
 
     @XmlEnumValue("unfile")
     UNFILE("unfile"),
@@ -34,7 +34,7 @@ public enum EnumUnfileNonfolderObjects {
     DELETE("delete");
     private final String value;
 
-    EnumUnfileNonfolderObjects(String v) {
+    EnumUnfileObject(String v) {
         value = v;
     }
 
@@ -42,8 +42,8 @@ public enum EnumUnfileNonfolderObjects {
         return value;
     }
 
-    public static EnumUnfileNonfolderObjects fromValue(String v) {
-        for (EnumUnfileNonfolderObjects c: EnumUnfileNonfolderObjects.values()) {
+    public static EnumUnfileObject fromValue(String v) {
+        for (EnumUnfileObject c: EnumUnfileObject.values()) {
             if (c.value.equals(v)) {
                 return c;
             }

source/generated/org/alfresco/repo/cmis/ws/EnumUpdateability.java

@@ -1,54 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for enumUpdateability.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="enumUpdateability">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="readonly"/>
- *     &lt;enumeration value="readwrite"/>
- *     &lt;enumeration value="whencheckedout"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "enumUpdateability", namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
-@XmlEnum
-public enum EnumUpdateability {
-
-    @XmlEnumValue("readonly")
-    READONLY("readonly"),
-    @XmlEnumValue("readwrite")
-    READWRITE("readwrite"),
-    @XmlEnumValue("whencheckedout")
-    WHENCHECKEDOUT("whencheckedout");
-    private final String value;
-
-    EnumUpdateability(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EnumUpdateability fromValue(String v) {
-        for (EnumUpdateability c: EnumUpdateability.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

source/generated/org/alfresco/repo/cmis/ws/GetACL.java

@@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="versionSeriesId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="objectId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="onlyBasicPermissions" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -31,15 +32,17 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "repositoryId",
-    "versionSeriesId"
+    "objectId",
+    "onlyBasicPermissions"
 })
-@XmlRootElement(name = "deleteAllVersions")
-public class DeleteAllVersions {
+@XmlRootElement(name = "getACL")
+public class GetACL {
 
     @XmlElement(required = true)
     protected String repositoryId;
     @XmlElement(required = true)
-    protected String versionSeriesId;
+    protected String objectId;
+    protected boolean onlyBasicPermissions;
 
     /**
      * Gets the value of the repositoryId property.
@@ -66,27 +69,43 @@ public class DeleteAllVersions {
     }
 
     /**
-     * Gets the value of the versionSeriesId property.
+     * Gets the value of the objectId property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getVersionSeriesId() {
-        return versionSeriesId;
+    public String getObjectId() {
+        return objectId;
     }
 
     /**
-     * Sets the value of the versionSeriesId property.
+     * Sets the value of the objectId property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setVersionSeriesId(String value) {
-        this.versionSeriesId = value;
+    public void setObjectId(String value) {
+        this.objectId = value;
+    }
+
+    /**
+     * Gets the value of the onlyBasicPermissions property.
+     * 
+     */
+    public boolean isOnlyBasicPermissions() {
+        return onlyBasicPermissions;
+    }
+
+    /**
+     * Sets the value of the onlyBasicPermissions property.
+     * 
+     */
+    public void setOnlyBasicPermissions(boolean value) {
+        this.onlyBasicPermissions = value;
     }
 
 }

source/generated/org/alfresco/repo/cmis/ws/GetACLResponse.java

@@ -0,0 +1,64 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="acl" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisAccessControlListType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "acl"
+})
+@XmlRootElement(name = "getACLResponse")
+public class GetACLResponse {
+
+    @XmlElement(required = true)
+    protected CmisAccessControlListType acl;
+
+    /**
+     * Gets the value of the acl property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link CmisAccessControlListType }
+     *     
+     */
+    public CmisAccessControlListType getAcl() {
+        return acl;
+    }
+
+    /**
+     * Sets the value of the acl property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link CmisAccessControlListType }
+     *     
+     */
+    public void setAcl(CmisAccessControlListType value) {
+        this.acl = value;
+    }
+
+}

source/generated/org/alfresco/repo/cmis/ws/GetAllVersionsResponse.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -20,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}object" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="object" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisObjectType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -36,7 +35,6 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "getAllVersionsResponse")
 public class GetAllVersionsResponse {
 
-    @XmlElement(namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
     protected List<CmisObjectType> object;
 
     /**

source/generated/org/alfresco/repo/cmis/ws/GetAppliedPoliciesResponse.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -20,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}object" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="object" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisObjectType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -36,7 +35,6 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "getAppliedPoliciesResponse")
 public class GetAppliedPoliciesResponse {
 
-    @XmlElement(namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
     protected List<CmisObjectType> object;
 
     /**

source/generated/org/alfresco/repo/cmis/ws/GetCheckedOutDocs.java

@@ -48,8 +48,8 @@ import javax.xml.bind.annotation.XmlType;
     "maxItems",
     "skipCount"
 })
-@XmlRootElement(name = "getCheckedoutDocs")
-public class GetCheckedoutDocs {
+@XmlRootElement(name = "getCheckedOutDocs")
+public class GetCheckedOutDocs {
 
     @XmlElement(required = true)
     protected String repositoryId;

source/generated/org/alfresco/repo/cmis/ws/GetCheckedOutDocsResponse.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -20,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}object" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="object" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisObjectType" maxOccurs="unbounded" minOccurs="0"/>
  *         <element name="hasMoreItems" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *       </sequence>
  *     </restriction>
@@ -35,10 +34,9 @@ import javax.xml.bind.annotation.XmlType;
     "object",
     "hasMoreItems"
 })
-@XmlRootElement(name = "getCheckedoutDocsResponse")
-public class GetCheckedoutDocsResponse {
+@XmlRootElement(name = "getCheckedOutDocsResponse")
+public class GetCheckedOutDocsResponse {
 
-    @XmlElement(namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
     protected List<CmisObjectType> object;
     protected boolean hasMoreItems;
 

source/generated/org/alfresco/repo/cmis/ws/GetChildren.java

@@ -23,10 +23,11 @@ import javax.xml.bind.annotation.XmlType;
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="folderId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="type" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumTypesOfFileableObjects" minOccurs="0"/>
  *         <element name="filter" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="includeRelationships" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumIncludeRelationships" minOccurs="0"/>
+ *         <element name="includeRenditions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         <element name="includeACL" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="maxItems" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="skipCount" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="orderBy" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
@@ -42,10 +43,11 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "", propOrder = {
     "repositoryId",
     "folderId",
-    "type",
     "filter",
     "includeAllowableActions",
     "includeRelationships",
+    "includeRenditions",
+    "includeACL",
     "maxItems",
     "skipCount",
     "orderBy"
@@ -57,14 +59,16 @@ public class GetChildren {
     protected String repositoryId;
     @XmlElement(required = true)
     protected String folderId;
-    @XmlElementRef(name = "type", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
-    protected JAXBElement<EnumTypesOfFileableObjects> type;
     @XmlElementRef(name = "filter", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<String> filter;
     @XmlElementRef(name = "includeAllowableActions", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<Boolean> includeAllowableActions;
     @XmlElementRef(name = "includeRelationships", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<EnumIncludeRelationships> includeRelationships;
+    @XmlElementRef(name = "includeRenditions", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<Boolean> includeRenditions;
+    @XmlElementRef(name = "includeACL", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<Boolean> includeACL;
     @XmlElementRef(name = "maxItems", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<BigInteger> maxItems;
     @XmlElementRef(name = "skipCount", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
@@ -119,30 +123,6 @@ public class GetChildren {
         this.folderId = value;
     }
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link JAXBElement }{@code <}{@link EnumTypesOfFileableObjects }{@code >}
-     *     
-     */
-    public JAXBElement<EnumTypesOfFileableObjects> getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link EnumTypesOfFileableObjects }{@code >}
-     *     
-     */
-    public void setType(JAXBElement<EnumTypesOfFileableObjects> value) {
-        this.type = ((JAXBElement<EnumTypesOfFileableObjects> ) value);
-    }
-
     /**
      * Gets the value of the filter property.
      * 
@@ -215,6 +195,54 @@ public class GetChildren {
         this.includeRelationships = ((JAXBElement<EnumIncludeRelationships> ) value);
     }
 
+    /**
+     * Gets the value of the includeRenditions property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public JAXBElement<Boolean> getIncludeRenditions() {
+        return includeRenditions;
+    }
+
+    /**
+     * Sets the value of the includeRenditions property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public void setIncludeRenditions(JAXBElement<Boolean> value) {
+        this.includeRenditions = ((JAXBElement<Boolean> ) value);
+    }
+
+    /**
+     * Gets the value of the includeACL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public JAXBElement<Boolean> getIncludeACL() {
+        return includeACL;
+    }
+
+    /**
+     * Sets the value of the includeACL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public void setIncludeACL(JAXBElement<Boolean> value) {
+        this.includeACL = ((JAXBElement<Boolean> ) value);
+    }
+
     /**
      * Gets the value of the maxItems property.
      * 

source/generated/org/alfresco/repo/cmis/ws/GetChildrenResponse.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -20,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}object" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="object" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisObjectType" maxOccurs="unbounded" minOccurs="0"/>
  *         <element name="hasMoreItems" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *       </sequence>
  *     </restriction>
@@ -38,7 +37,6 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "getChildrenResponse")
 public class GetChildrenResponse {
 
-    @XmlElement(namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
     protected List<CmisObjectType> object;
     protected boolean hasMoreItems;
 

source/generated/org/alfresco/repo/cmis/ws/GetContentStream.java

@@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlType;
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="documentId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="streamId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -31,7 +32,8 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "repositoryId",
-    "documentId"
+    "documentId",
+    "streamId"
 })
 @XmlRootElement(name = "getContentStream")
 public class GetContentStream {
@@ -40,6 +42,7 @@ public class GetContentStream {
     protected String repositoryId;
     @XmlElement(required = true)
     protected String documentId;
+    protected String streamId;
 
     /**
      * Gets the value of the repositoryId property.
@@ -89,4 +92,28 @@ public class GetContentStream {
         this.documentId = value;
     }
 
+    /**
+     * Gets the value of the streamId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getStreamId() {
+        return streamId;
+    }
+
+    /**
+     * Sets the value of the streamId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStreamId(String value) {
+        this.streamId = value;
+    }
+
 }

source/generated/org/alfresco/repo/cmis/ws/GetContentStreamResponse.java

@@ -18,7 +18,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="contentStream" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisContentStreamType"/>
+ *         <element name="contentStream" type="{http://docs.oasis-open.org/ns/cmis/messaging/200901}cmisContentStreamType"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>

source/generated/org/alfresco/repo/cmis/ws/GetDescendants.java

@@ -23,11 +23,11 @@ import javax.xml.bind.annotation.XmlType;
  *       <sequence>
  *         <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="folderId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="type" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumTypesOfFileableObjects" minOccurs="0"/>
  *         <element name="depth" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="filter" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="includeRelationships" type="{http://docs.oasis-open.org/ns/cmis/core/200901}enumIncludeRelationships" minOccurs="0"/>
+ *         <element name="includeRenditions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="orderBy" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
@@ -41,11 +41,11 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "", propOrder = {
     "repositoryId",
     "folderId",
-    "type",
     "depth",
     "filter",
     "includeAllowableActions",
     "includeRelationships",
+    "includeRenditions",
     "orderBy"
 })
 @XmlRootElement(name = "getDescendants")
@@ -55,7 +55,6 @@ public class GetDescendants {
     protected String repositoryId;
     @XmlElement(required = true)
     protected String folderId;
-    protected EnumTypesOfFileableObjects type;
     @XmlElementRef(name = "depth", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<BigInteger> depth;
     @XmlElementRef(name = "filter", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
@@ -64,6 +63,8 @@ public class GetDescendants {
     protected JAXBElement<Boolean> includeAllowableActions;
     @XmlElementRef(name = "includeRelationships", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
     protected JAXBElement<EnumIncludeRelationships> includeRelationships;
+    @XmlElementRef(name = "includeRenditions", namespace = "http://docs.oasis-open.org/ns/cmis/messaging/200901", type = JAXBElement.class)
+    protected JAXBElement<Boolean> includeRenditions;
     protected String orderBy;
 
     /**
@@ -114,30 +115,6 @@ public class GetDescendants {
         this.folderId = value;
     }
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EnumTypesOfFileableObjects }
-     *     
-     */
-    public EnumTypesOfFileableObjects getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EnumTypesOfFileableObjects }
-     *     
-     */
-    public void setType(EnumTypesOfFileableObjects value) {
-        this.type = value;
-    }
-
     /**
      * Gets the value of the depth property.
      * 
@@ -234,6 +211,30 @@ public class GetDescendants {
         this.includeRelationships = ((JAXBElement<EnumIncludeRelationships> ) value);
     }
 
+    /**
+     * Gets the value of the includeRenditions property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public JAXBElement<Boolean> getIncludeRenditions() {
+        return includeRenditions;
+    }
+
+    /**
+     * Sets the value of the includeRenditions property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     
+     */
+    public void setIncludeRenditions(JAXBElement<Boolean> value) {
+        this.includeRenditions = ((JAXBElement<Boolean> ) value);
+    }
+
     /**
      * Gets the value of the orderBy property.
      * 

source/generated/org/alfresco/repo/cmis/ws/GetDescendantsResponse.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -20,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://docs.oasis-open.org/ns/cmis/core/200901}object" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="object" type="{http://docs.oasis-open.org/ns/cmis/core/200901}cmisObjectType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -36,7 +35,6 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "getDescendantsResponse")
 public class GetDescendantsResponse {
 
-    @XmlElement(namespace = "http://docs.oasis-open.org/ns/cmis/core/200901")
     protected List<CmisObjectType> object;
 
     /**