Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

@@ -72,14 +72,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -240,14 +232,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -336,14 +320,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"

source/generated/org/alfresco/repo/webservice/action/Action.java

@@ -8,6 +8,8 @@
 package org.alfresco.repo.webservice.action;
 
 public class Action  implements java.io.Serializable {
+    private org.alfresco.repo.webservice.types.Reference actionReference;
+
     private java.lang.String id;
 
     private java.lang.String actionName;
@@ -16,8 +18,6 @@ public class Action  implements java.io.Serializable {
 
     private java.lang.String description;
 
-    private boolean executeAsynchronously;
-
     private org.alfresco.repo.webservice.types.NamedValue[] parameters;
 
     private org.alfresco.repo.webservice.action.Condition[] conditions;
@@ -26,32 +26,48 @@ public class Action  implements java.io.Serializable {
 
     private org.alfresco.repo.webservice.action.Action[] actions;
 
-    private org.alfresco.repo.webservice.types.Reference reference;
-
     public Action() {
     }
 
     public Action(
+           org.alfresco.repo.webservice.types.Reference actionReference,
            java.lang.String id,
            java.lang.String actionName,
            java.lang.String title,
            java.lang.String description,
-           boolean executeAsynchronously,
            org.alfresco.repo.webservice.types.NamedValue[] parameters,
            org.alfresco.repo.webservice.action.Condition[] conditions,
            org.alfresco.repo.webservice.action.Action compensatingAction,
-           org.alfresco.repo.webservice.action.Action[] actions,
+           org.alfresco.repo.webservice.action.Action[] actions) {
-           org.alfresco.repo.webservice.types.Reference reference) {
+           this.actionReference = actionReference;
            this.id = id;
            this.actionName = actionName;
            this.title = title;
            this.description = description;
-           this.executeAsynchronously = executeAsynchronously;
            this.parameters = parameters;
            this.conditions = conditions;
            this.compensatingAction = compensatingAction;
            this.actions = actions;
-           this.reference = reference;
+    }
+
+
+    /**
+     * Gets the actionReference value for this Action.
+     * 
+     * @return actionReference
+     */
+    public org.alfresco.repo.webservice.types.Reference getActionReference() {
+        return actionReference;
+    }
+
+
+    /**
+     * Sets the actionReference value for this Action.
+     * 
+     * @param actionReference
+     */
+    public void setActionReference(org.alfresco.repo.webservice.types.Reference actionReference) {
+        this.actionReference = actionReference;
     }
 
 
@@ -135,26 +151,6 @@ public class Action  implements java.io.Serializable {
     }
 
 
-    /**
-     * Gets the executeAsynchronously value for this Action.
-     * 
-     * @return executeAsynchronously
-     */
-    public boolean isExecuteAsynchronously() {
-        return executeAsynchronously;
-    }
-
-
-    /**
-     * Sets the executeAsynchronously value for this Action.
-     * 
-     * @param executeAsynchronously
-     */
-    public void setExecuteAsynchronously(boolean executeAsynchronously) {
-        this.executeAsynchronously = executeAsynchronously;
-    }
-
-
     /**
      * Gets the parameters value for this Action.
      * 
@@ -258,26 +254,6 @@ public class Action  implements java.io.Serializable {
         this.actions[i] = _value;
     }
 
-
-    /**
-     * Gets the reference value for this Action.
-     * 
-     * @return reference
-     */
-    public org.alfresco.repo.webservice.types.Reference getReference() {
-        return reference;
-    }
-
-
-    /**
-     * Sets the reference value for this Action.
-     * 
-     * @param reference
-     */
-    public void setReference(org.alfresco.repo.webservice.types.Reference reference) {
-        this.reference = reference;
-    }
-
     private java.lang.Object __equalsCalc = null;
     public synchronized boolean equals(java.lang.Object obj) {
         if (!(obj instanceof Action)) return false;
@@ -290,6 +266,9 @@ public class Action  implements java.io.Serializable {
         __equalsCalc = obj;
         boolean _equals;
         _equals = true && 
+            ((this.actionReference==null && other.getActionReference()==null) || 
+             (this.actionReference!=null &&
+              this.actionReference.equals(other.getActionReference()))) &&
             ((this.id==null && other.getId()==null) || 
              (this.id!=null &&
               this.id.equals(other.getId()))) &&
@@ -302,7 +281,6 @@ public class Action  implements java.io.Serializable {
             ((this.description==null && other.getDescription()==null) || 
              (this.description!=null &&
               this.description.equals(other.getDescription()))) &&
-            this.executeAsynchronously == other.isExecuteAsynchronously() &&
             ((this.parameters==null && other.getParameters()==null) || 
              (this.parameters!=null &&
               java.util.Arrays.equals(this.parameters, other.getParameters()))) &&
@@ -314,10 +292,7 @@ public class Action  implements java.io.Serializable {
               this.compensatingAction.equals(other.getCompensatingAction()))) &&
             ((this.actions==null && other.getActions()==null) || 
              (this.actions!=null &&
-              java.util.Arrays.equals(this.actions, other.getActions()))) &&
+              java.util.Arrays.equals(this.actions, other.getActions())));
-            ((this.reference==null && other.getReference()==null) || 
-             (this.reference!=null &&
-              this.reference.equals(other.getReference())));
         __equalsCalc = null;
         return _equals;
     }
@@ -329,6 +304,9 @@ public class Action  implements java.io.Serializable {
         }
         __hashCodeCalc = true;
         int _hashCode = 1;
+        if (getActionReference() != null) {
+            _hashCode += getActionReference().hashCode();
+        }
         if (getId() != null) {
             _hashCode += getId().hashCode();
         }
@@ -341,7 +319,6 @@ public class Action  implements java.io.Serializable {
         if (getDescription() != null) {
             _hashCode += getDescription().hashCode();
         }
-        _hashCode += (isExecuteAsynchronously() ? Boolean.TRUE : Boolean.FALSE).hashCode();
         if (getParameters() != null) {
             for (int i=0;
                  i<java.lang.reflect.Array.getLength(getParameters());
@@ -378,9 +355,6 @@ public class Action  implements java.io.Serializable {
                 }
             }
         }
-        if (getReference() != null) {
-            _hashCode += getReference().hashCode();
-        }
         __hashCodeCalc = false;
         return _hashCode;
     }
@@ -392,6 +366,12 @@ public class Action  implements java.io.Serializable {
     static {
         typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "Action"));
         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("actionReference");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "actionReference"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
@@ -416,12 +396,6 @@ public class Action  implements java.io.Serializable {
         elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("executeAsynchronously");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "executeAsynchronously"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
-        elemField.setNillable(false);
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("parameters");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "parameters"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "NamedValue"));
@@ -451,12 +425,6 @@ public class Action  implements java.io.Serializable {
         elemField.setNillable(true);
         elemField.setMaxOccursUnbounded(true);
         typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("reference");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "reference"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
-        elemField.setNillable(true);
-        typeDesc.addFieldDesc(elemField);
     }
 
     /**

source/generated/org/alfresco/repo/webservice/action/Rule.java

@@ -8,9 +8,11 @@
 package org.alfresco.repo.webservice.action;
 
 public class Rule  implements java.io.Serializable {
-    private java.lang.String id;
+    private org.alfresco.repo.webservice.types.Reference ruleReference;
 
-    private java.lang.String ruleType;
+    private org.alfresco.repo.webservice.types.Reference owningReference;
+
+    private java.lang.String[] ruleTypes;
 
     private java.lang.String title;
 
@@ -18,76 +20,94 @@ public class Rule  implements java.io.Serializable {
 
     private boolean executeAsynchronously;
 
-    private org.alfresco.repo.webservice.action.Condition[] conditions;
+    private org.alfresco.repo.webservice.action.Action action;
-
-    private org.alfresco.repo.webservice.action.Action[] actions;
-
-    private java.lang.String runAsUserName;
-
-    private org.alfresco.repo.webservice.types.Reference reference;
 
     public Rule() {
     }
 
     public Rule(
-           java.lang.String id,
+           org.alfresco.repo.webservice.types.Reference ruleReference,
-           java.lang.String ruleType,
+           org.alfresco.repo.webservice.types.Reference owningReference,
+           java.lang.String[] ruleTypes,
            java.lang.String title,
            java.lang.String description,
            boolean executeAsynchronously,
-           org.alfresco.repo.webservice.action.Condition[] conditions,
+           org.alfresco.repo.webservice.action.Action action) {
-           org.alfresco.repo.webservice.action.Action[] actions,
+           this.ruleReference = ruleReference;
-           java.lang.String runAsUserName,
+           this.owningReference = owningReference;
-           org.alfresco.repo.webservice.types.Reference reference) {
+           this.ruleTypes = ruleTypes;
-           this.id = id;
-           this.ruleType = ruleType;
            this.title = title;
            this.description = description;
            this.executeAsynchronously = executeAsynchronously;
-           this.conditions = conditions;
+           this.action = action;
-           this.actions = actions;
-           this.runAsUserName = runAsUserName;
-           this.reference = reference;
     }
 
 
     /**
-     * Gets the id value for this Rule.
+     * Gets the ruleReference value for this Rule.
      * 
-     * @return id
+     * @return ruleReference
      */
-    public java.lang.String getId() {
+    public org.alfresco.repo.webservice.types.Reference getRuleReference() {
-        return id;
+        return ruleReference;
     }
 
 
     /**
-     * Sets the id value for this Rule.
+     * Sets the ruleReference value for this Rule.
      * 
-     * @param id
+     * @param ruleReference
      */
-    public void setId(java.lang.String id) {
+    public void setRuleReference(org.alfresco.repo.webservice.types.Reference ruleReference) {
-        this.id = id;
+        this.ruleReference = ruleReference;
     }
 
 
     /**
-     * Gets the ruleType value for this Rule.
+     * Gets the owningReference value for this Rule.
      * 
-     * @return ruleType
+     * @return owningReference
      */
-    public java.lang.String getRuleType() {
+    public org.alfresco.repo.webservice.types.Reference getOwningReference() {
-        return ruleType;
+        return owningReference;
     }
 
 
     /**
-     * Sets the ruleType value for this Rule.
+     * Sets the owningReference value for this Rule.
      * 
-     * @param ruleType
+     * @param owningReference
      */
-    public void setRuleType(java.lang.String ruleType) {
+    public void setOwningReference(org.alfresco.repo.webservice.types.Reference owningReference) {
-        this.ruleType = ruleType;
+        this.owningReference = owningReference;
+    }
+
+
+    /**
+     * Gets the ruleTypes value for this Rule.
+     * 
+     * @return ruleTypes
+     */
+    public java.lang.String[] getRuleTypes() {
+        return ruleTypes;
+    }
+
+
+    /**
+     * Sets the ruleTypes value for this Rule.
+     * 
+     * @param ruleTypes
+     */
+    public void setRuleTypes(java.lang.String[] ruleTypes) {
+        this.ruleTypes = ruleTypes;
+    }
+
+    public java.lang.String getRuleTypes(int i) {
+        return this.ruleTypes[i];
+    }
+
+    public void setRuleTypes(int i, java.lang.String _value) {
+        this.ruleTypes[i] = _value;
     }
 
 
@@ -152,98 +172,22 @@ public class Rule  implements java.io.Serializable {
 
 
     /**
-     * Gets the conditions value for this Rule.
+     * Gets the action value for this Rule.
      * 
-     * @return conditions
+     * @return action
      */
-    public org.alfresco.repo.webservice.action.Condition[] getConditions() {
+    public org.alfresco.repo.webservice.action.Action getAction() {
-        return conditions;
+        return action;
     }
 
 
     /**
-     * Sets the conditions value for this Rule.
+     * Sets the action value for this Rule.
      * 
-     * @param conditions
+     * @param action
      */
-    public void setConditions(org.alfresco.repo.webservice.action.Condition[] conditions) {
+    public void setAction(org.alfresco.repo.webservice.action.Action action) {
-        this.conditions = conditions;
+        this.action = action;
-    }
-
-    public org.alfresco.repo.webservice.action.Condition getConditions(int i) {
-        return this.conditions[i];
-    }
-
-    public void setConditions(int i, org.alfresco.repo.webservice.action.Condition _value) {
-        this.conditions[i] = _value;
-    }
-
-
-    /**
-     * Gets the actions value for this Rule.
-     * 
-     * @return actions
-     */
-    public org.alfresco.repo.webservice.action.Action[] getActions() {
-        return actions;
-    }
-
-
-    /**
-     * Sets the actions value for this Rule.
-     * 
-     * @param actions
-     */
-    public void setActions(org.alfresco.repo.webservice.action.Action[] actions) {
-        this.actions = actions;
-    }
-
-    public org.alfresco.repo.webservice.action.Action getActions(int i) {
-        return this.actions[i];
-    }
-
-    public void setActions(int i, org.alfresco.repo.webservice.action.Action _value) {
-        this.actions[i] = _value;
-    }
-
-
-    /**
-     * Gets the runAsUserName value for this Rule.
-     * 
-     * @return runAsUserName
-     */
-    public java.lang.String getRunAsUserName() {
-        return runAsUserName;
-    }
-
-
-    /**
-     * Sets the runAsUserName value for this Rule.
-     * 
-     * @param runAsUserName
-     */
-    public void setRunAsUserName(java.lang.String runAsUserName) {
-        this.runAsUserName = runAsUserName;
-    }
-
-
-    /**
-     * Gets the reference value for this Rule.
-     * 
-     * @return reference
-     */
-    public org.alfresco.repo.webservice.types.Reference getReference() {
-        return reference;
-    }
-
-
-    /**
-     * Sets the reference value for this Rule.
-     * 
-     * @param reference
-     */
-    public void setReference(org.alfresco.repo.webservice.types.Reference reference) {
-        this.reference = reference;
     }
 
     private java.lang.Object __equalsCalc = null;
@@ -258,12 +202,15 @@ public class Rule  implements java.io.Serializable {
         __equalsCalc = obj;
         boolean _equals;
         _equals = true && 
-            ((this.id==null && other.getId()==null) || 
+            ((this.ruleReference==null && other.getRuleReference()==null) || 
-             (this.id!=null &&
+             (this.ruleReference!=null &&
-              this.id.equals(other.getId()))) &&
+              this.ruleReference.equals(other.getRuleReference()))) &&
-            ((this.ruleType==null && other.getRuleType()==null) || 
+            ((this.owningReference==null && other.getOwningReference()==null) || 
-             (this.ruleType!=null &&
+             (this.owningReference!=null &&
-              this.ruleType.equals(other.getRuleType()))) &&
+              this.owningReference.equals(other.getOwningReference()))) &&
+            ((this.ruleTypes==null && other.getRuleTypes()==null) || 
+             (this.ruleTypes!=null &&
+              java.util.Arrays.equals(this.ruleTypes, other.getRuleTypes()))) &&
             ((this.title==null && other.getTitle()==null) || 
              (this.title!=null &&
               this.title.equals(other.getTitle()))) &&
@@ -271,18 +218,9 @@ public class Rule  implements java.io.Serializable {
              (this.description!=null &&
               this.description.equals(other.getDescription()))) &&
             this.executeAsynchronously == other.isExecuteAsynchronously() &&
-            ((this.conditions==null && other.getConditions()==null) || 
+            ((this.action==null && other.getAction()==null) || 
-             (this.conditions!=null &&
+             (this.action!=null &&
-              java.util.Arrays.equals(this.conditions, other.getConditions()))) &&
+              this.action.equals(other.getAction())));
-            ((this.actions==null && other.getActions()==null) || 
-             (this.actions!=null &&
-              java.util.Arrays.equals(this.actions, other.getActions()))) &&
-            ((this.runAsUserName==null && other.getRunAsUserName()==null) || 
-             (this.runAsUserName!=null &&
-              this.runAsUserName.equals(other.getRunAsUserName()))) &&
-            ((this.reference==null && other.getReference()==null) || 
-             (this.reference!=null &&
-              this.reference.equals(other.getReference())));
         __equalsCalc = null;
         return _equals;
     }
@@ -294,11 +232,22 @@ public class Rule  implements java.io.Serializable {
         }
         __hashCodeCalc = true;
         int _hashCode = 1;
-        if (getId() != null) {
+        if (getRuleReference() != null) {
-            _hashCode += getId().hashCode();
+            _hashCode += getRuleReference().hashCode();
         }
-        if (getRuleType() != null) {
+        if (getOwningReference() != null) {
-            _hashCode += getRuleType().hashCode();
+            _hashCode += getOwningReference().hashCode();
+        }
+        if (getRuleTypes() != null) {
+            for (int i=0;
+                 i<java.lang.reflect.Array.getLength(getRuleTypes());
+                 i++) {
+                java.lang.Object obj = java.lang.reflect.Array.get(getRuleTypes(), i);
+                if (obj != null &&
+                    !obj.getClass().isArray()) {
+                    _hashCode += obj.hashCode();
+                }
+            }
         }
         if (getTitle() != null) {
             _hashCode += getTitle().hashCode();
@@ -307,33 +256,8 @@ public class Rule  implements java.io.Serializable {
             _hashCode += getDescription().hashCode();
         }
         _hashCode += (isExecuteAsynchronously() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-        if (getConditions() != null) {
+        if (getAction() != null) {
-            for (int i=0;
+            _hashCode += getAction().hashCode();
-                 i<java.lang.reflect.Array.getLength(getConditions());
-                 i++) {
-                java.lang.Object obj = java.lang.reflect.Array.get(getConditions(), i);
-                if (obj != null &&
-                    !obj.getClass().isArray()) {
-                    _hashCode += obj.hashCode();
-                }
-            }
-        }
-        if (getActions() != null) {
-            for (int i=0;
-                 i<java.lang.reflect.Array.getLength(getActions());
-                 i++) {
-                java.lang.Object obj = java.lang.reflect.Array.get(getActions(), i);
-                if (obj != null &&
-                    !obj.getClass().isArray()) {
-                    _hashCode += obj.hashCode();
-                }
-            }
-        }
-        if (getRunAsUserName() != null) {
-            _hashCode += getRunAsUserName().hashCode();
-        }
-        if (getReference() != null) {
-            _hashCode += getReference().hashCode();
         }
         __hashCodeCalc = false;
         return _hashCode;
@@ -346,16 +270,23 @@ public class Rule  implements java.io.Serializable {
     static {
         typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "Rule"));
         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("id");
+        elemField.setFieldName("ruleReference");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "id"));
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "ruleReference"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
         elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("ruleType");
+        elemField.setFieldName("owningReference");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "ruleType"));
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "owningReference"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("ruleTypes");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "ruleTypes"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setNillable(false);
+        elemField.setMaxOccursUnbounded(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("title");
@@ -376,31 +307,10 @@ public class Rule  implements java.io.Serializable {
         elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("conditions");
+        elemField.setFieldName("action");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "conditions"));
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "action"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "Condition"));
-        elemField.setMinOccurs(0);
-        elemField.setNillable(true);
-        elemField.setMaxOccursUnbounded(true);
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("actions");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "actions"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "Action"));
         elemField.setNillable(false);
-        elemField.setMaxOccursUnbounded(true);
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("runAsUserName");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "runAsUserName"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(true);
-        typeDesc.addFieldDesc(elemField);
-        elemField = new org.apache.axis.description.ElementDesc();
-        elemField.setFieldName("reference");
-        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/action/1.0", "reference"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
-        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 

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

@@ -85,12 +85,20 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
+        qname="ns:Cardinality"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
+        type="java:org.alfresco.repo.webservice.types.Cardinality"
         serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ClassDefinition"
+        type="java:org.alfresco.repo.webservice.types.ClassDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
         qname="ns:Rule"
@@ -117,8 +125,8 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Predicate"
+        qname="ns:Version"
-        type="java:org.alfresco.repo.webservice.types.Predicate"
+        type="java:org.alfresco.repo.webservice.types.Version"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
@@ -133,128 +141,16 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:NodeDefinition"
+        qname="ns:Predicate"
-        type="java:org.alfresco.repo.webservice.types.NodeDefinition"
+        type="java:org.alfresco.repo.webservice.types.Predicate"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ValueDefinition"
+        qname="ns:ResultSetRow"
-        type="java:org.alfresco.repo.webservice.types.ValueDefinition"
+        type="java:org.alfresco.repo.webservice.types.ResultSetRow"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Category"
-        type="java:org.alfresco.repo.webservice.types.Category"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
-        qname="ns:ActionFault"
-        type="java:org.alfresco.repo.webservice.action.ActionFault"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Reference"
-        type="java:org.alfresco.repo.webservice.types.Reference"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:NamedValue"
-        type="java:org.alfresco.repo.webservice.types.NamedValue"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:UUID"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>ResultSetRow>node"
-        type="java:org.alfresco.repo.webservice.types.ResultSetRowNode"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Classification"
-        type="java:org.alfresco.repo.webservice.types.Classification"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
-        qname="ns:ActionFilter"
-        type="java:org.alfresco.repo.webservice.action.ActionFilter"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Store"
-        type="java:org.alfresco.repo.webservice.types.Store"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:PropertyDefinition"
-        type="java:org.alfresco.repo.webservice.types.PropertyDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ClassDefinition"
-        type="java:org.alfresco.repo.webservice.types.ClassDefinition"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Cardinality"
-        type="java:org.alfresco.repo.webservice.types.Cardinality"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:Version"
-        type="java:org.alfresco.repo.webservice.types.Version"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
@@ -267,14 +163,6 @@
         deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:ResultSetRow"
-        type="java:org.alfresco.repo.webservice.types.ResultSetRow"
-        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ResultSet"
@@ -299,6 +187,38 @@
         deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:NodeDefinition"
+        type="java:org.alfresco.repo.webservice.types.NodeDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Category"
+        type="java:org.alfresco.repo.webservice.types.Category"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:ValueDefinition"
+        type="java:org.alfresco.repo.webservice.types.ValueDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
+        qname="ns:ActionFault"
+        type="java:org.alfresco.repo.webservice.action.ActionFault"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
         qname="ns:RuleFilter"
@@ -333,10 +253,26 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
+        qname="ns:Reference"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
+        type="java:org.alfresco.repo.webservice.types.Reference"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:UUID"
+        type="java:java.lang.String"
+        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:NamedValue"
+        type="java:org.alfresco.repo.webservice.types.NamedValue"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
       <typeMapping
@@ -355,6 +291,14 @@
         deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:>ResultSetRow>node"
+        type="java:org.alfresco.repo.webservice.types.ResultSetRowNode"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:>ContentFormat>encoding"
@@ -371,6 +315,30 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Classification"
+        type="java:org.alfresco.repo.webservice.types.Classification"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
+        qname="ns:ActionFilter"
+        type="java:org.alfresco.repo.webservice.action.ActionFilter"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:Store"
+        type="java:org.alfresco.repo.webservice.types.Store"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"
@@ -379,6 +347,14 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
+        qname="ns:RoleDefinition"
+        type="java:org.alfresco.repo.webservice.types.RoleDefinition"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/action/1.0"
         qname="ns:ActionExecutionResult"
@@ -389,8 +365,8 @@
       />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:RoleDefinition"
+        qname="ns:PropertyDefinition"
-        type="java:org.alfresco.repo.webservice.types.RoleDefinition"
+        type="java:org.alfresco.repo.webservice.types.PropertyDefinition"
         serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""

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

@@ -60,14 +60,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -212,14 +204,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -300,14 +284,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"

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

@@ -87,14 +87,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -255,14 +247,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -343,14 +327,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"

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

@@ -51,14 +51,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -179,14 +171,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -267,14 +251,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"

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

@@ -47,14 +47,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -183,14 +175,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -263,14 +247,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/service/content/1.0"
         qname="ns:ContentFault"

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

@@ -48,14 +48,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -184,14 +176,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -264,14 +248,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:AssociationDefinition"

source/generated/org/alfresco/repo/webservice/repository/RepositoryServiceSoapPort.java

@@ -12,7 +12,7 @@ public interface RepositoryServiceSoapPort extends java.rmi.Remote {
     /**
      * Creates a new repository store.
      */
-    public org.alfresco.repo.webservice.types.Store createStore(org.alfresco.repo.webservice.types.StoreEnum scheme, java.lang.String address) throws java.rmi.RemoteException, org.alfresco.repo.webservice.repository.RepositoryFault;
+    public org.alfresco.repo.webservice.types.Store createStore(java.lang.String scheme, java.lang.String address) throws java.rmi.RemoteException, org.alfresco.repo.webservice.repository.RepositoryFault;
 
     /**
      * Retrieves a list of stores where content resources are held.

source/generated/org/alfresco/repo/webservice/repository/UpdateResult.java

@@ -12,6 +12,8 @@ public class UpdateResult  implements java.io.Serializable {
 
     private org.alfresco.repo.webservice.types.ResultSet updateCount;
 
+    private java.lang.String sourceId;
+
     private org.alfresco.repo.webservice.types.Reference source;
 
     private org.alfresco.repo.webservice.types.Reference destination;
@@ -22,10 +24,12 @@ public class UpdateResult  implements java.io.Serializable {
     public UpdateResult(
            java.lang.String statement,
            org.alfresco.repo.webservice.types.ResultSet updateCount,
+           java.lang.String sourceId,
            org.alfresco.repo.webservice.types.Reference source,
            org.alfresco.repo.webservice.types.Reference destination) {
            this.statement = statement;
            this.updateCount = updateCount;
+           this.sourceId = sourceId;
            this.source = source;
            this.destination = destination;
     }
@@ -71,6 +75,26 @@ public class UpdateResult  implements java.io.Serializable {
     }
 
 
+    /**
+     * Gets the sourceId value for this UpdateResult.
+     * 
+     * @return sourceId
+     */
+    public java.lang.String getSourceId() {
+        return sourceId;
+    }
+
+
+    /**
+     * Sets the sourceId value for this UpdateResult.
+     * 
+     * @param sourceId
+     */
+    public void setSourceId(java.lang.String sourceId) {
+        this.sourceId = sourceId;
+    }
+
+
     /**
      * Gets the source value for this UpdateResult.
      * 
@@ -128,6 +152,9 @@ public class UpdateResult  implements java.io.Serializable {
             ((this.updateCount==null && other.getUpdateCount()==null) || 
              (this.updateCount!=null &&
               this.updateCount.equals(other.getUpdateCount()))) &&
+            ((this.sourceId==null && other.getSourceId()==null) || 
+             (this.sourceId!=null &&
+              this.sourceId.equals(other.getSourceId()))) &&
             ((this.source==null && other.getSource()==null) || 
              (this.source!=null &&
               this.source.equals(other.getSource()))) &&
@@ -151,6 +178,9 @@ public class UpdateResult  implements java.io.Serializable {
         if (getUpdateCount() != null) {
             _hashCode += getUpdateCount().hashCode();
         }
+        if (getSourceId() != null) {
+            _hashCode += getSourceId().hashCode();
+        }
         if (getSource() != null) {
             _hashCode += getSource().hashCode();
         }
@@ -180,6 +210,12 @@ public class UpdateResult  implements java.io.Serializable {
         elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("sourceId");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/repository/1.0", "sourceId"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("source");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/service/repository/1.0", "source"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));

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

@@ -21,7 +21,7 @@
       <parameter name="wsdlPortType" value="RepositoryServiceSoapPort"/>
       <parameter name="typeMappingVersion" value="1.2"/>
       <operation name="createStore" qname="operNS:createStore" xmlns:operNS="http://www.alfresco.org/ws/service/repository/1.0" returnQName="retNS:createStoreReturn" xmlns:retNS="http://www.alfresco.org/ws/service/repository/1.0" returnType="rtns:Store" xmlns:rtns="http://www.alfresco.org/ws/model/content/1.0" soapAction="http://www.alfresco.org/ws/service/repository/1.0/createStore" >
-        <parameter qname="pns:scheme" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:StoreEnum" xmlns:tns="http://www.alfresco.org/ws/model/content/1.0"/>
+        <parameter qname="pns:scheme" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <parameter qname="pns:address" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <fault name="RepositoryFault" qname="fns:RepositoryFault" xmlns:fns="http://www.alfresco.org/ws/service/repository/1.0" class="org.alfresco.repo.webservice.repository.RepositoryFault" type="tns:RepositoryFault" xmlns:tns="http://www.alfresco.org/ws/service/repository/1.0"/>
       </operation>
@@ -73,14 +73,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>move"
@@ -233,6 +225,14 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
+      <typeMapping
+        xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
+        qname="ns:>CML>writeContent"
+        type="java:org.alfresco.repo.webservice.types.CMLWriteContent"
+        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
+        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
+        encodingStyle=""
+      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>removeAspect"
@@ -249,14 +249,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:>Store>address"
-        type="java:java.lang.String"
-        serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>create"
@@ -392,14 +384,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>removeAssociation"

source/generated/org/alfresco/repo/webservice/types/CML.java

@@ -16,6 +16,8 @@ public class CML  implements java.io.Serializable {
 
     private org.alfresco.repo.webservice.types.CMLUpdate[] update;
 
+    private org.alfresco.repo.webservice.types.CMLWriteContent[] writeContent;
+
     private org.alfresco.repo.webservice.types.CMLDelete[] delete;
 
     private org.alfresco.repo.webservice.types.CMLMove[] move;
@@ -38,6 +40,7 @@ public class CML  implements java.io.Serializable {
            org.alfresco.repo.webservice.types.CMLAddAspect[] addAspect,
            org.alfresco.repo.webservice.types.CMLRemoveAspect[] removeAspect,
            org.alfresco.repo.webservice.types.CMLUpdate[] update,
+           org.alfresco.repo.webservice.types.CMLWriteContent[] writeContent,
            org.alfresco.repo.webservice.types.CMLDelete[] delete,
            org.alfresco.repo.webservice.types.CMLMove[] move,
            org.alfresco.repo.webservice.types.CMLCopy[] copy,
@@ -49,6 +52,7 @@ public class CML  implements java.io.Serializable {
            this.addAspect = addAspect;
            this.removeAspect = removeAspect;
            this.update = update;
+           this.writeContent = writeContent;
            this.delete = delete;
            this.move = move;
            this.copy = copy;
@@ -171,6 +175,34 @@ public class CML  implements java.io.Serializable {
     }
 
 
+    /**
+     * Gets the writeContent value for this CML.
+     * 
+     * @return writeContent
+     */
+    public org.alfresco.repo.webservice.types.CMLWriteContent[] getWriteContent() {
+        return writeContent;
+    }
+
+
+    /**
+     * Sets the writeContent value for this CML.
+     * 
+     * @param writeContent
+     */
+    public void setWriteContent(org.alfresco.repo.webservice.types.CMLWriteContent[] writeContent) {
+        this.writeContent = writeContent;
+    }
+
+    public org.alfresco.repo.webservice.types.CMLWriteContent getWriteContent(int i) {
+        return this.writeContent[i];
+    }
+
+    public void setWriteContent(int i, org.alfresco.repo.webservice.types.CMLWriteContent _value) {
+        this.writeContent[i] = _value;
+    }
+
+
     /**
      * Gets the delete value for this CML.
      * 
@@ -390,6 +422,9 @@ public class CML  implements java.io.Serializable {
             ((this.update==null && other.getUpdate()==null) || 
              (this.update!=null &&
               java.util.Arrays.equals(this.update, other.getUpdate()))) &&
+            ((this.writeContent==null && other.getWriteContent()==null) || 
+             (this.writeContent!=null &&
+              java.util.Arrays.equals(this.writeContent, other.getWriteContent()))) &&
             ((this.delete==null && other.getDelete()==null) || 
              (this.delete!=null &&
               java.util.Arrays.equals(this.delete, other.getDelete()))) &&
@@ -466,6 +501,17 @@ public class CML  implements java.io.Serializable {
                 }
             }
         }
+        if (getWriteContent() != null) {
+            for (int i=0;
+                 i<java.lang.reflect.Array.getLength(getWriteContent());
+                 i++) {
+                java.lang.Object obj = java.lang.reflect.Array.get(getWriteContent(), i);
+                if (obj != null &&
+                    !obj.getClass().isArray()) {
+                    _hashCode += obj.hashCode();
+                }
+            }
+        }
         if (getDelete() != null) {
             for (int i=0;
                  i<java.lang.reflect.Array.getLength(getDelete());
@@ -586,6 +632,14 @@ public class CML  implements java.io.Serializable {
         elemField.setMaxOccursUnbounded(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("writeContent");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "writeContent"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", ">CML>writeContent"));
+        elemField.setMinOccurs(0);
+        elemField.setNillable(false);
+        elemField.setMaxOccursUnbounded(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("delete");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "delete"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", ">CML>delete"));

source/generated/org/alfresco/repo/webservice/types/CMLAddAspect.java

@@ -202,14 +202,14 @@ public class CMLAddAspect  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 

source/generated/org/alfresco/repo/webservice/types/CMLAddChild.java

@@ -232,13 +232,14 @@ public class CMLAddChild  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "ParentReference"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(false);
+        elemField.setMinOccurs(0);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("associationType");
@@ -259,14 +260,14 @@ public class CMLAddChild  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 

source/generated/org/alfresco/repo/webservice/types/CMLCopy.java

@@ -262,13 +262,14 @@ public class CMLCopy  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "ParentReference"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(false);
+        elemField.setMinOccurs(0);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("associationType");
@@ -289,14 +290,14 @@ public class CMLCopy  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("children");

source/generated/org/alfresco/repo/webservice/types/CMLCreateAssociation.java

@@ -202,28 +202,28 @@ public class CMLCreateAssociation  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("from_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("association");

source/generated/org/alfresco/repo/webservice/types/CMLMove.java

@@ -232,13 +232,14 @@ public class CMLMove  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "ParentReference"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
-        elemField.setNillable(false);
+        elemField.setMinOccurs(0);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("associationType");
@@ -259,14 +260,14 @@ public class CMLMove  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 

source/generated/org/alfresco/repo/webservice/types/CMLRemoveAspect.java

@@ -148,14 +148,14 @@ public class CMLRemoveAspect  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 

source/generated/org/alfresco/repo/webservice/types/CMLRemoveAssociation.java

@@ -202,28 +202,28 @@ public class CMLRemoveAssociation  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("from_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("to_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "to_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("association");

source/generated/org/alfresco/repo/webservice/types/CMLRemoveChild.java

@@ -172,28 +172,28 @@ public class CMLRemoveChild  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Reference"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("from_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "from_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 

source/generated/org/alfresco/repo/webservice/types/CMLUpdate.java

@@ -165,14 +165,14 @@ public class CMLUpdate  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("where_id");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 

source/generated/org/alfresco/repo/webservice/types/CMLWriteContent.java

@@ -0,0 +1,273 @@
+/**
+ * CMLWriteContent.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.3 Oct 05, 2005 (05:23:37 EDT) WSDL2Java emitter.
+ */
+
+package org.alfresco.repo.webservice.types;
+
+public class CMLWriteContent  implements java.io.Serializable {
+    private java.lang.String property;
+
+    private byte[] content;
+
+    private org.alfresco.repo.webservice.types.ContentFormat format;
+
+    private org.alfresco.repo.webservice.types.Predicate where;
+
+    private java.lang.String where_id;
+
+    public CMLWriteContent() {
+    }
+
+    public CMLWriteContent(
+           java.lang.String property,
+           byte[] content,
+           org.alfresco.repo.webservice.types.ContentFormat format,
+           org.alfresco.repo.webservice.types.Predicate where,
+           java.lang.String where_id) {
+           this.property = property;
+           this.content = content;
+           this.format = format;
+           this.where = where;
+           this.where_id = where_id;
+    }
+
+
+    /**
+     * Gets the property value for this CMLWriteContent.
+     * 
+     * @return property
+     */
+    public java.lang.String getProperty() {
+        return property;
+    }
+
+
+    /**
+     * Sets the property value for this CMLWriteContent.
+     * 
+     * @param property
+     */
+    public void setProperty(java.lang.String property) {
+        this.property = property;
+    }
+
+
+    /**
+     * Gets the content value for this CMLWriteContent.
+     * 
+     * @return content
+     */
+    public byte[] getContent() {
+        return content;
+    }
+
+
+    /**
+     * Sets the content value for this CMLWriteContent.
+     * 
+     * @param content
+     */
+    public void setContent(byte[] content) {
+        this.content = content;
+    }
+
+
+    /**
+     * Gets the format value for this CMLWriteContent.
+     * 
+     * @return format
+     */
+    public org.alfresco.repo.webservice.types.ContentFormat getFormat() {
+        return format;
+    }
+
+
+    /**
+     * Sets the format value for this CMLWriteContent.
+     * 
+     * @param format
+     */
+    public void setFormat(org.alfresco.repo.webservice.types.ContentFormat format) {
+        this.format = format;
+    }
+
+
+    /**
+     * Gets the where value for this CMLWriteContent.
+     * 
+     * @return where
+     */
+    public org.alfresco.repo.webservice.types.Predicate getWhere() {
+        return where;
+    }
+
+
+    /**
+     * Sets the where value for this CMLWriteContent.
+     * 
+     * @param where
+     */
+    public void setWhere(org.alfresco.repo.webservice.types.Predicate where) {
+        this.where = where;
+    }
+
+
+    /**
+     * Gets the where_id value for this CMLWriteContent.
+     * 
+     * @return where_id
+     */
+    public java.lang.String getWhere_id() {
+        return where_id;
+    }
+
+
+    /**
+     * Sets the where_id value for this CMLWriteContent.
+     * 
+     * @param where_id
+     */
+    public void setWhere_id(java.lang.String where_id) {
+        this.where_id = where_id;
+    }
+
+    private java.lang.Object __equalsCalc = null;
+    public synchronized boolean equals(java.lang.Object obj) {
+        if (!(obj instanceof CMLWriteContent)) return false;
+        CMLWriteContent other = (CMLWriteContent) obj;
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+        __equalsCalc = obj;
+        boolean _equals;
+        _equals = true && 
+            ((this.property==null && other.getProperty()==null) || 
+             (this.property!=null &&
+              this.property.equals(other.getProperty()))) &&
+            ((this.content==null && other.getContent()==null) || 
+             (this.content!=null &&
+              java.util.Arrays.equals(this.content, other.getContent()))) &&
+            ((this.format==null && other.getFormat()==null) || 
+             (this.format!=null &&
+              this.format.equals(other.getFormat()))) &&
+            ((this.where==null && other.getWhere()==null) || 
+             (this.where!=null &&
+              this.where.equals(other.getWhere()))) &&
+            ((this.where_id==null && other.getWhere_id()==null) || 
+             (this.where_id!=null &&
+              this.where_id.equals(other.getWhere_id())));
+        __equalsCalc = null;
+        return _equals;
+    }
+
+    private boolean __hashCodeCalc = false;
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+        __hashCodeCalc = true;
+        int _hashCode = 1;
+        if (getProperty() != null) {
+            _hashCode += getProperty().hashCode();
+        }
+        if (getContent() != null) {
+            for (int i=0;
+                 i<java.lang.reflect.Array.getLength(getContent());
+                 i++) {
+                java.lang.Object obj = java.lang.reflect.Array.get(getContent(), i);
+                if (obj != null &&
+                    !obj.getClass().isArray()) {
+                    _hashCode += obj.hashCode();
+                }
+            }
+        }
+        if (getFormat() != null) {
+            _hashCode += getFormat().hashCode();
+        }
+        if (getWhere() != null) {
+            _hashCode += getWhere().hashCode();
+        }
+        if (getWhere_id() != null) {
+            _hashCode += getWhere_id().hashCode();
+        }
+        __hashCodeCalc = false;
+        return _hashCode;
+    }
+
+    // Type metadata
+    private static org.apache.axis.description.TypeDesc typeDesc =
+        new org.apache.axis.description.TypeDesc(CMLWriteContent.class, true);
+
+    static {
+        typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", ">CML>writeContent"));
+        org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("property");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "property"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("content");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "content"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "base64Binary"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("format");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "format"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "ContentFormat"));
+        elemField.setNillable(false);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("where");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "Predicate"));
+        elemField.setMinOccurs(0);
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+        elemField = new org.apache.axis.description.ElementDesc();
+        elemField.setFieldName("where_id");
+        elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/cml/1.0", "where_id"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        elemField.setMinOccurs(0);
+        elemField.setNillable(true);
+        typeDesc.addFieldDesc(elemField);
+    }
+
+    /**
+     * Return type metadata object
+     */
+    public static org.apache.axis.description.TypeDesc getTypeDesc() {
+        return typeDesc;
+    }
+
+    /**
+     * Get Custom Serializer
+     */
+    public static org.apache.axis.encoding.Serializer getSerializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanSerializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+    /**
+     * Get Custom Deserializer
+     */
+    public static org.apache.axis.encoding.Deserializer getDeserializer(
+           java.lang.String mechType, 
+           java.lang.Class _javaType,  
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanDeserializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+}

source/generated/org/alfresco/repo/webservice/types/NamedValue.java

@@ -206,7 +206,7 @@ public class NamedValue  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "values"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         elemField.setMaxOccursUnbounded(true);
         typeDesc.addFieldDesc(elemField);
     }

source/generated/org/alfresco/repo/webservice/types/Query.java

@@ -8,7 +8,7 @@
 package org.alfresco.repo.webservice.types;
 
 public class Query  implements java.io.Serializable {
-    private org.alfresco.repo.webservice.types.QueryLanguageEnum language;
+    private java.lang.String language;
 
     private java.lang.String statement;
 
@@ -16,7 +16,7 @@ public class Query  implements java.io.Serializable {
     }
 
     public Query(
-           org.alfresco.repo.webservice.types.QueryLanguageEnum language,
+           java.lang.String language,
            java.lang.String statement) {
            this.language = language;
            this.statement = statement;
@@ -28,7 +28,7 @@ public class Query  implements java.io.Serializable {
      * 
      * @return language
      */
-    public org.alfresco.repo.webservice.types.QueryLanguageEnum getLanguage() {
+    public java.lang.String getLanguage() {
         return language;
     }
 
@@ -38,7 +38,7 @@ public class Query  implements java.io.Serializable {
      * 
      * @param language
      */
-    public void setLanguage(org.alfresco.repo.webservice.types.QueryLanguageEnum language) {
+    public void setLanguage(java.lang.String language) {
         this.language = language;
     }
 
@@ -110,7 +110,7 @@ public class Query  implements java.io.Serializable {
         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("language");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "language"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "QueryLanguageEnum"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();

source/generated/org/alfresco/repo/webservice/types/QueryLanguageEnum.java

@@ -1,72 +0,0 @@
-/**
- * QueryLanguageEnum.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.3 Oct 05, 2005 (05:23:37 EDT) WSDL2Java emitter.
- */
-
-package org.alfresco.repo.webservice.types;
-
-public class QueryLanguageEnum implements java.io.Serializable {
-    private java.lang.String _value_;
-    private static java.util.HashMap _table_ = new java.util.HashMap();
-
-    // Constructor
-    protected QueryLanguageEnum(java.lang.String value) {
-        _value_ = value;
-        _table_.put(_value_,this);
-    }
-
-    public static final java.lang.String _lucene = "lucene";
-    public static final java.lang.String _xpath = "xpath";
-    public static final java.lang.String _cql = "cql";
-    public static final QueryLanguageEnum lucene = new QueryLanguageEnum(_lucene);
-    public static final QueryLanguageEnum xpath = new QueryLanguageEnum(_xpath);
-    public static final QueryLanguageEnum cql = new QueryLanguageEnum(_cql);
-    public java.lang.String getValue() { return _value_;}
-    public static QueryLanguageEnum fromValue(java.lang.String value)
-          throws java.lang.IllegalArgumentException {
-        QueryLanguageEnum enumeration = (QueryLanguageEnum)
-            _table_.get(value);
-        if (enumeration==null) enumeration = lucene;
-        return enumeration;
-    }
-    public static QueryLanguageEnum fromString(java.lang.String value)
-          throws java.lang.IllegalArgumentException {
-        return fromValue(value);
-    }
-    public boolean equals(java.lang.Object obj) {return (obj == this);}
-    public int hashCode() { return toString().hashCode();}
-    public java.lang.String toString() { return _value_;}
-    public java.lang.Object readResolve() throws java.io.ObjectStreamException { return fromValue(_value_);}
-    public static org.apache.axis.encoding.Serializer getSerializer(
-           java.lang.String mechType, 
-           java.lang.Class _javaType,  
-           javax.xml.namespace.QName _xmlType) {
-        return 
-          new org.apache.axis.encoding.ser.EnumSerializer(
-            _javaType, _xmlType);
-    }
-    public static org.apache.axis.encoding.Deserializer getDeserializer(
-           java.lang.String mechType, 
-           java.lang.Class _javaType,  
-           javax.xml.namespace.QName _xmlType) {
-        return 
-          new org.apache.axis.encoding.ser.EnumDeserializer(
-            _javaType, _xmlType);
-    }
-    // Type metadata
-    private static org.apache.axis.description.TypeDesc typeDesc =
-        new org.apache.axis.description.TypeDesc(QueryLanguageEnum.class);
-
-    static {
-        typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "QueryLanguageEnum"));
-    }
-    /**
-     * Return type metadata object
-     */
-    public static org.apache.axis.description.TypeDesc getTypeDesc() {
-        return typeDesc;
-    }
-
-}

source/generated/org/alfresco/repo/webservice/types/Reference.java

@@ -148,14 +148,14 @@ public class Reference  implements java.io.Serializable {
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "uuid"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("path");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "path"));
         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setMinOccurs(0);
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
     }
 

source/generated/org/alfresco/repo/webservice/types/Store.java

@@ -8,7 +8,7 @@
 package org.alfresco.repo.webservice.types;
 
 public class Store  implements java.io.Serializable {
-    private org.alfresco.repo.webservice.types.StoreEnum scheme;
+    private java.lang.String scheme;
 
     private java.lang.String address;
 
@@ -16,7 +16,7 @@ public class Store  implements java.io.Serializable {
     }
 
     public Store(
-           org.alfresco.repo.webservice.types.StoreEnum scheme,
+           java.lang.String scheme,
            java.lang.String address) {
            this.scheme = scheme;
            this.address = address;
@@ -28,7 +28,7 @@ public class Store  implements java.io.Serializable {
      * 
      * @return scheme
      */
-    public org.alfresco.repo.webservice.types.StoreEnum getScheme() {
+    public java.lang.String getScheme() {
         return scheme;
     }
 
@@ -38,7 +38,7 @@ public class Store  implements java.io.Serializable {
      * 
      * @param scheme
      */
-    public void setScheme(org.alfresco.repo.webservice.types.StoreEnum scheme) {
+    public void setScheme(java.lang.String scheme) {
         this.scheme = scheme;
     }
 
@@ -110,7 +110,7 @@ public class Store  implements java.io.Serializable {
         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("scheme");
         elemField.setXmlName(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "scheme"));
-        elemField.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "StoreEnum"));
+        elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
         elemField.setNillable(false);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();

source/generated/org/alfresco/repo/webservice/types/StoreEnum.java

@@ -1,78 +0,0 @@
-/**
- * StoreEnum.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.3 Oct 05, 2005 (05:23:37 EDT) WSDL2Java emitter.
- */
-
-package org.alfresco.repo.webservice.types;
-
-public class StoreEnum implements java.io.Serializable {
-    private java.lang.String _value_;
-    private static java.util.HashMap _table_ = new java.util.HashMap();
-
-    // Constructor
-    protected StoreEnum(java.lang.String value) {
-        _value_ = value;
-        _table_.put(_value_,this);
-    }
-
-    public static final java.lang.String _workspace = "workspace";
-    public static final java.lang.String _versionStore = "versionStore";
-    public static final java.lang.String _user = "user";
-    public static final java.lang.String _search = "search";
-    public static final java.lang.String _http = "http";
-    public static final java.lang.String _system = "system";
-    public static final StoreEnum workspace = new StoreEnum(_workspace);
-    public static final StoreEnum versionStore = new StoreEnum(_versionStore);
-    public static final StoreEnum user = new StoreEnum(_user);
-    public static final StoreEnum search = new StoreEnum(_search);
-    public static final StoreEnum http = new StoreEnum(_http);
-    public static final StoreEnum system = new StoreEnum(_system);
-    public java.lang.String getValue() { return _value_;}
-    public static StoreEnum fromValue(java.lang.String value)
-          throws java.lang.IllegalArgumentException {
-        StoreEnum enumeration = (StoreEnum)
-            _table_.get(value);
-        if (enumeration==null) enumeration = workspace;
-        return enumeration;
-    }
-    public static StoreEnum fromString(java.lang.String value)
-          throws java.lang.IllegalArgumentException {
-        return fromValue(value);
-    }
-    public boolean equals(java.lang.Object obj) {return (obj == this);}
-    public int hashCode() { return toString().hashCode();}
-    public java.lang.String toString() { return _value_;}
-    public java.lang.Object readResolve() throws java.io.ObjectStreamException { return fromValue(_value_);}
-    public static org.apache.axis.encoding.Serializer getSerializer(
-           java.lang.String mechType, 
-           java.lang.Class _javaType,  
-           javax.xml.namespace.QName _xmlType) {
-        return 
-          new org.apache.axis.encoding.ser.EnumSerializer(
-            _javaType, _xmlType);
-    }
-    public static org.apache.axis.encoding.Deserializer getDeserializer(
-           java.lang.String mechType, 
-           java.lang.Class _javaType,  
-           javax.xml.namespace.QName _xmlType) {
-        return 
-          new org.apache.axis.encoding.ser.EnumDeserializer(
-            _javaType, _xmlType);
-    }
-    // Type metadata
-    private static org.apache.axis.description.TypeDesc typeDesc =
-        new org.apache.axis.description.TypeDesc(StoreEnum.class);
-
-    static {
-        typeDesc.setXmlType(new javax.xml.namespace.QName("http://www.alfresco.org/ws/model/content/1.0", "StoreEnum"));
-    }
-    /**
-     * Return type metadata object
-     */
-    public static org.apache.axis.description.TypeDesc getTypeDesc() {
-        return typeDesc;
-    }
-
-}

source/java/org/alfresco/repo/webservice/CMLUtil.java

@@ -16,6 +16,8 @@
  */
 package org.alfresco.repo.webservice;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,11 +37,15 @@ import org.alfresco.repo.webservice.types.CMLRemoveAspect;
 import org.alfresco.repo.webservice.types.CMLRemoveAssociation;
 import org.alfresco.repo.webservice.types.CMLRemoveChild;
 import org.alfresco.repo.webservice.types.CMLUpdate;
+import org.alfresco.repo.webservice.types.CMLWriteContent;
+import org.alfresco.repo.webservice.types.ContentFormat;
 import org.alfresco.repo.webservice.types.NamedValue;
 import org.alfresco.repo.webservice.types.ParentReference;
 import org.alfresco.repo.webservice.types.Predicate;
 import org.alfresco.repo.webservice.types.Reference;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.CopyService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -64,12 +70,14 @@ public class CMLUtil
     private static final String REMOVE_CHILD = "removeChild";
     private static final String CREATE_ASSOCIATION = "createAssociation";
     private static final String REMOVE_ASSOCIATION = "removeAssociation";
+    private static final String WRITE_CONTENT = "writeContent";
     
     private NodeService nodeService;
     private SearchService searchService;
     private NamespaceService namespaceService;
     private CopyService copyService;
     private DictionaryService dictionaryService;
+    private ContentService contentService;
     
     public void setNodeService(NodeService nodeService)
     {
@@ -96,6 +104,11 @@ public class CMLUtil
         this.dictionaryService = dictionaryService;
     }
     
+    public void setContentService(ContentService contentService)
+    {
+        this.contentService = contentService;
+    }
+    
     /**
      * Execute a cml update query.
      * 
@@ -147,6 +160,15 @@ public class CMLUtil
             }
         }
         
+        CMLWriteContent[] writes = cml.getWriteContent();
+        if (writes != null)
+        {
+            for (CMLWriteContent write : writes)
+            {
+                executeCMLWriteContent(write, context, results);
+            }
+        }
+        
         // Execute delete
         CMLDelete[] deletes = cml.getDelete();
         if (deletes != null)
@@ -253,7 +275,7 @@ public class CMLUtil
             context.addId(id, nodeRef);
         }
 
-        results.add(createResult(CREATE, null, nodeRef));
+        results.add(createResult(CREATE, id, null, nodeRef));
     }
     
     /**
@@ -277,10 +299,14 @@ public class CMLUtil
         return properties;
     }
     
-    private UpdateResult createResult(String cmd, NodeRef sourceNodeRef, NodeRef destinationNodeRef)
+    private UpdateResult createResult(String cmd, String sourceId, NodeRef sourceNodeRef, NodeRef destinationNodeRef)
     {
         UpdateResult result = new UpdateResult();
         result.setStatement(cmd);
+        if (sourceId != null)
+        {
+            result.setSourceId(sourceId);
+        }
         if (sourceNodeRef != null)
         {
             result.setSource(Utils.convertToReference(sourceNodeRef));
@@ -313,7 +339,7 @@ public class CMLUtil
             this.nodeService.addAspect(nodeRef, aspectQName, properties);
             
             // Create the result
-            results.add(createResult(ADD_ASPECT, nodeRef, nodeRef));
+            results.add(createResult(ADD_ASPECT, null, nodeRef, nodeRef));
         }        
     }
     
@@ -331,7 +357,7 @@ public class CMLUtil
             this.nodeService.removeAspect(nodeRef, aspectQName);
             
             // Create the result
-            results.add(createResult(REMOVE_ASPECT, nodeRef, nodeRef));
+            results.add(createResult(REMOVE_ASPECT, null, nodeRef, nodeRef));
         } 
     }
     
@@ -367,10 +393,38 @@ public class CMLUtil
             this.nodeService.setProperties(nodeRef, currentProps);
             
             // Get the result
-            results.add(createResult(UPDATE, nodeRef, nodeRef));
+            results.add(createResult(UPDATE, null, nodeRef, nodeRef));
         }        
     }
     
+    private void executeCMLWriteContent(CMLWriteContent write, ExecutionContext context, List<UpdateResult> results)
+    {
+        // Get the nodes and content property
+        List<NodeRef> nodeRefs = getNodeRefList(write.getWhere_id(), write.getWhere(), context);
+        QName property = QName.createQName(write.getProperty());
+        ContentFormat format = write.getFormat();
+        byte[] content = write.getContent();
+        
+        for (NodeRef nodeRef : nodeRefs)
+        {            
+            //Get the content writer
+            ContentWriter writer = this.contentService.getWriter(nodeRef, property, true);
+            
+            // Set the content format details (if they have been specified)
+            if (format != null)
+            {
+                writer.setEncoding(format.getEncoding());
+                writer.setMimetype(format.getMimetype());
+            }
+            
+            // Write the content 
+            InputStream is = new ByteArrayInputStream(content);
+            writer.putContent(is);
+            
+            results.add(createResult(WRITE_CONTENT, null, nodeRef, nodeRef));
+        }
+    }
+    
     private void executeCMLDelete(CMLDelete delete, ExecutionContext context, List<UpdateResult> results)
     {
         List<NodeRef> nodeRefs = Utils.resolvePredicate(delete.getWhere(), this.nodeService, this.searchService, this.namespaceService);
@@ -380,7 +434,7 @@ public class CMLUtil
             this.nodeService.deleteNode(nodeRef);
             
             // Create the result
-            results.add(createResult(DELETE, nodeRef, null));
+            results.add(createResult(DELETE, null, nodeRef, null));
         }
     }
     
@@ -408,7 +462,7 @@ public class CMLUtil
                 NodeRef newNodeRef = this.nodeService.moveNode(nodeToMove, destinationNodeRef, assocType, assocName).getChildRef();
                 
                 // Create the result
-                results.add(createResult(MOVE, nodeToMove, newNodeRef));
+                results.add(createResult(MOVE, null, nodeToMove, newNodeRef));
             }
         }
     }    
@@ -474,7 +528,7 @@ public class CMLUtil
                 NodeRef newNodeRef = this.copyService.copy(nodeToCopy, destinationNodeRef, assocType, assocName, copyChildren);
                 
                 // Create the result
-                results.add(createResult(COPY, nodeToCopy, newNodeRef));
+                results.add(createResult(COPY, null, nodeToCopy, newNodeRef));
             }
         }
         
@@ -504,7 +558,7 @@ public class CMLUtil
                 this.nodeService.addChild(nodeRef, whereNodeRef, assocType, assocName);
                 
                 // Create the result
-                results.add(createResult(ADD_CHILD, nodeRef, whereNodeRef));
+                results.add(createResult(ADD_CHILD, null, nodeRef, whereNodeRef));
             }
         }
     }    
@@ -520,7 +574,7 @@ public class CMLUtil
                 this.nodeService.removeChild(parentNodeRef, childNodeRef);
                 
                 // Create the result
-                results.add(createResult(REMOVE_CHILD, parentNodeRef, null));
+                results.add(createResult(REMOVE_CHILD, null, parentNodeRef, null));
             }
         }
         
@@ -540,7 +594,7 @@ public class CMLUtil
                     this.nodeService.createAssociation(fromNodeRef, toNodeRef, assocType);
                     
                     // Create the result
-                    results.add(createResult(CREATE_ASSOCIATION, fromNodeRef, toNodeRef));
+                    results.add(createResult(CREATE_ASSOCIATION, null, fromNodeRef, toNodeRef));
                 }
             }
         }        
@@ -560,7 +614,7 @@ public class CMLUtil
                     this.nodeService.removeAssociation(fromNodeRef, toNodeRef, assocType);
                     
                     // Create the result
-                    results.add(createResult(REMOVE_ASSOCIATION, fromNodeRef, toNodeRef));
+                    results.add(createResult(REMOVE_ASSOCIATION, null, fromNodeRef, toNodeRef));
                 }
             }
         }        
@@ -569,15 +623,22 @@ public class CMLUtil
     private class ExecutionContext
     {
         private Map<String, NodeRef> idMap = new HashMap<String, NodeRef>();
+        private Map<NodeRef, String> nodeRefMap = new HashMap<NodeRef, String>();
         
         public void addId(String id, NodeRef nodeRef)
         {
             this.idMap.put(id, nodeRef);
+            this.nodeRefMap.put(nodeRef, id);
         }
         
         public NodeRef getNodeRef(String id)
         {
             return this.idMap.get(id);
         }
+        
+        public String getId(NodeRef nodeRef)
+        {
+            return this.nodeRefMap.get(nodeRef);
+        }
     }
 }

source/java/org/alfresco/repo/webservice/CMLUtilTest.java

@@ -34,6 +34,8 @@ import org.alfresco.repo.webservice.types.CMLRemoveAspect;
 import org.alfresco.repo.webservice.types.CMLRemoveAssociation;
 import org.alfresco.repo.webservice.types.CMLRemoveChild;
 import org.alfresco.repo.webservice.types.CMLUpdate;
+import org.alfresco.repo.webservice.types.CMLWriteContent;
+import org.alfresco.repo.webservice.types.ContentFormat;
 import org.alfresco.repo.webservice.types.NamedValue;
 import org.alfresco.repo.webservice.types.ParentReference;
 import org.alfresco.repo.webservice.types.Predicate;
@@ -41,6 +43,8 @@ import org.alfresco.repo.webservice.types.Reference;
 import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
@@ -57,6 +61,7 @@ public class CMLUtilTest extends BaseSpringTest
 {
     private static final ContentData CONTENT_DATA_TEXT_UTF8 = new ContentData(null, MimetypeMap.MIMETYPE_TEXT_PLAIN, 0L, "UTF-8");
     private static final ContentData CONTENT_DATA_HTML_UTF16 = new ContentData(null, MimetypeMap.MIMETYPE_HTML, 0L, "UTF-16");
+    private static final String TEST_CONTENT = "This is some test content";
     
     private CMLUtil cmlUtil;
     private NodeService nodeService;
@@ -67,6 +72,7 @@ public class CMLUtilTest extends BaseSpringTest
     private SearchService searchService;
     private NodeRef folderNodeRef;
     private AuthenticationComponent authenticationComponent;
+    private ContentService contentService;
 
     @Override
     protected String[] getConfigLocations()
@@ -82,6 +88,7 @@ public class CMLUtilTest extends BaseSpringTest
         this.searchService = (SearchService)this.applicationContext.getBean("searchService");
         this.namespaceService = (NamespaceService)this.applicationContext.getBean("namespaceService");
         this.authenticationComponent = (AuthenticationComponent) this.applicationContext.getBean("authenticationComponent");
+        this.contentService = (ContentService)this.applicationContext.getBean("contentService");
         
         this.authenticationComponent.setSystemUserAsCurrentUser();
         
@@ -212,6 +219,32 @@ public class CMLUtilTest extends BaseSpringTest
         assertEquals(CONTENT_DATA_HTML_UTF16, this.nodeService.getProperty(this.nodeRef, ContentModel.PROP_CONTENT));
     }
     
+    public void testWriteContent()
+    {
+        CMLWriteContent write = new CMLWriteContent();
+        write.setWhere(createPredicate(this.nodeRef));
+        write.setProperty(ContentModel.PROP_CONTENT.toString());
+        ContentFormat format = new ContentFormat(MimetypeMap.MIMETYPE_TEXT_PLAIN, "UTF-8");
+        write.setFormat(format);
+        write.setContent(TEST_CONTENT.getBytes());
+        
+        CML cml = new CML();
+        cml.setWriteContent(new CMLWriteContent[]{write});
+        
+        UpdateResult[] result = this.cmlUtil.executeCML(cml);
+        assertNotNull(result);
+        assertEquals(1, result.length);
+        
+        UpdateResult updateResult = result[0];
+        assertEquals("writeContent", updateResult.getStatement());
+        assertNotNull(updateResult.getSource());
+        assertNotNull(updateResult.getDestination());
+        
+        ContentReader reader = this.contentService.getReader(this.nodeRef, ContentModel.PROP_CONTENT);
+        assertNotNull(reader);
+        assertEquals(reader.getContentString(), TEST_CONTENT);
+    }
+    
     public void testDelete()
     {
         CMLDelete delete = new CMLDelete();

source/java/org/alfresco/repo/webservice/Utils.java

@@ -37,11 +37,9 @@ import org.alfresco.repo.webservice.types.ParentReference;
 import org.alfresco.repo.webservice.types.Predicate;
 import org.alfresco.repo.webservice.types.PropertyDefinition;
 import org.alfresco.repo.webservice.types.Query;
-import org.alfresco.repo.webservice.types.QueryLanguageEnum;
 import org.alfresco.repo.webservice.types.Reference;
 import org.alfresco.repo.webservice.types.RoleDefinition;
 import org.alfresco.repo.webservice.types.Store;
-import org.alfresco.repo.webservice.types.StoreEnum;
 import org.alfresco.repo.webservice.types.Version;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -80,6 +78,12 @@ public class Utils
         // don't allow construction
     }
     
+    /** Query language names */
+    public static final String QUERY_LANG_LUCENE = "lucene";
+    public static final String QUERY_LANG_XPATH = "xpath";
+    public static final String QUERY_LANG_CQL = "cql";
+    
+    
     /**
      * Utility method to convert from a string representation of a property value into the correct object representation.
      * 
@@ -222,7 +226,7 @@ public class Utils
      */
     public static StoreRef convertToStoreRef(Store store)
     {
-        return new StoreRef(store.getScheme().getValue(), store.getAddress());
+        return new StoreRef(store.getScheme(), store.getAddress());
     }
 
     /**
@@ -234,7 +238,7 @@ public class Utils
      */
     public static Store convertToStore(StoreRef ref)
     {
-        return new Store(StoreEnum.fromValue(ref.getProtocol()), ref
+        return new Store(ref.getProtocol(), ref
                 .getIdentifier());
     }
 
@@ -284,8 +288,7 @@ public class Utils
     public static Reference convertToReference(NodeRef node)
     {
         Reference ref = new Reference();
-        Store store = new Store(StoreEnum.fromValue(node.getStoreRef()
+        Store store = new Store(node.getStoreRef().getProtocol(), node.getStoreRef().getIdentifier());
-                .getProtocol()), node.getStoreRef().getIdentifier());
         ref.setStore(store);
         ref.setUuid(node.getId());
         return ref;
@@ -351,7 +354,7 @@ public class Utils
             {
                 StringBuilder builder = new StringBuilder(
                         "Failed to resolve to a single NodeRef with parameters (store=");
-                builder.append(store.getScheme().getValue()).append(":")
+                builder.append(store.getScheme()).append(":")
                         .append(store.getAddress());
                 builder.append(" uuid=").append(uuid);
                 builder.append(" path=").append(path).append("), found ");
@@ -425,13 +428,11 @@ public class Utils
                         "A Store has to be supplied to in order to execute a query.");
             }
 
-            QueryLanguageEnum langEnum = query.getLanguage();
+            String language = query.getLanguage();
-
+            if (language.equals(QUERY_LANG_LUCENE) != true)
-            if (langEnum.equals(QueryLanguageEnum.cql)
-                    || langEnum.equals(QueryLanguageEnum.xpath))
             {
                 throw new IllegalArgumentException("Only '"
-                        + QueryLanguageEnum.lucene.getValue()
+                        + QUERY_LANG_LUCENE
                         + "' queries are currently supported!");
             }
 
@@ -440,8 +441,7 @@ public class Utils
             try
             {
                 searchResults = searchService.query(Utils
-                    .convertToStoreRef(predicate.getStore()), langEnum
+                    .convertToStoreRef(predicate.getStore()), language, query.getStatement());
-                    .getValue(), query.getStatement());
                 // get hold of all the NodeRef's from the results
                 nodeRefs = searchResults.getNodeRefs();
             }

source/java/org/alfresco/repo/webservice/action/ActionWebService.java

@@ -26,7 +26,6 @@ import org.alfresco.repo.action.ActionConditionImpl;
 import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.repo.action.CompositeActionImpl;
 import org.alfresco.repo.action.executer.CompositeActionExecuter;
-import org.alfresco.repo.rule.RuleImpl;
 import org.alfresco.repo.transaction.TransactionComponent;
 import org.alfresco.repo.transaction.TransactionUtil;
 import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
@@ -482,26 +481,17 @@ public class ActionWebService extends AbstractWebService implements ActionServic
             }
         }
         
-        // Get the reference to the 'owning' node
-        NodeRef owningNodeRef = action.getOwningNodeRef();
-        Reference reference = null; 
-        if (owningNodeRef != null)
-        {
-            reference = Utils.convertToReference(owningNodeRef);
-        }
-        
         // Create the web service action object
         org.alfresco.repo.webservice.action.Action webServiceAction = new org.alfresco.repo.webservice.action.Action(
+                Utils.convertToReference(action.getNodeRef()),
                 action.getId(),
                 action.getActionDefinitionName(),
                 action.getTitle(),
                 action.getDescription(),
-                action.getExecuteAsychronously(),
                 namedValues,
                 webServiceConditions,
                 webServiceCompensatingAction,
-                childWebServiceActions,
+                childWebServiceActions);
-                reference);
         
         return webServiceAction;
     }
@@ -638,15 +628,12 @@ public class ActionWebService extends AbstractWebService implements ActionServic
             id = GUID.generate();
         }
         
-        // Get the owning node ref
+        // Try and get the action node reference
-        NodeRef owningNodeRef = null;
+        NodeRef actionNodeRef = null;
-        if (webServiceAction.getReference() != null)
+        Reference actionReference = webServiceAction.getActionReference();
+        if (actionReference != null)
         {
-            owningNodeRef = Utils.convertToNodeRef(
+            actionNodeRef = Utils.convertToNodeRef(actionReference, this.nodeService, this.searchService, this.namespaceService);
-                webServiceAction.getReference(),
-                this.nodeService,
-                this.searchService,
-                this.namespaceService);
         }
         
         // Create the action (or composite action)
@@ -654,20 +641,16 @@ public class ActionWebService extends AbstractWebService implements ActionServic
         String actionDefinitionName = webServiceAction.getActionName();        
         if (CompositeActionExecuter.NAME.equals(actionDefinitionName) == true)
         {
-            action = new CompositeActionImpl(id, owningNodeRef);
+            action = new CompositeActionImpl(actionNodeRef, id);
         }
         else
         {
-            action = new ActionImpl(id, actionDefinitionName, owningNodeRef);
+            action = new ActionImpl(actionNodeRef, id, actionDefinitionName);
         }
         
         // Set some of the action's details
         action.setTitle(webServiceAction.getTitle());
         action.setDescription(webServiceAction.getDescription());
-        if (webServiceAction.isExecuteAsynchronously() == true)
-        {
-            action.setExecuteAsynchronously(true);
-        }
         
         // Set the parameters
         NamedValue[] namedValues = webServiceAction.getParameters();
@@ -958,51 +941,23 @@ public class ActionWebService extends AbstractWebService implements ActionServic
     }
     
     private org.alfresco.repo.webservice.action.Rule convertToWebServiceRule(Rule rule)
-    {
+    {        
-        // Get the run as user
+        Reference owningReference = null;
-        // TODO for now set to null since this has no effect yet
+        NodeRef owningNodeRef = this.ruleService.getOwningNodeRef(rule);
-        String runAsUserName = null;
-        
-        // Get the conditions
-        List<ActionCondition> conditions = rule.getActionConditions();
-        Condition[] webServiceConditions = new Condition[conditions.size()];
-        int index2 = 0;
-        for (ActionCondition condition : conditions)
-        {
-            webServiceConditions[index2] = convertToWebServiceCondition(condition);
-            index2++;
-        }
-                
-        // Sort out any sub-actions
-        org.alfresco.repo.webservice.action.Action[] childWebServiceActions = null;
-        List<Action> childActions = rule.getActions();
-        childWebServiceActions = new org.alfresco.repo.webservice.action.Action[childActions.size()];
-        int index3 = 0;
-        for (Action childAction : childActions)
-        {
-            childWebServiceActions[index3] = convertToWebServiceAction(childAction);
-            index3 ++;
-        }
-        
-        // Get the reference to the 'owning' node
-        NodeRef owningNodeRef = rule.getOwningNodeRef();
-        Reference reference = null; 
         if (owningNodeRef != null)
         {
-            reference = Utils.convertToReference(owningNodeRef);
+            owningReference = Utils.convertToReference(owningNodeRef);
         }
         
         // Create the web service rule object
         org.alfresco.repo.webservice.action.Rule webServiceRule = new org.alfresco.repo.webservice.action.Rule(
-                rule.getId(),
+                Utils.convertToReference(rule.getNodeRef()),
-                rule.getRuleTypeName(),
+                owningReference,
+                rule.getRuleTypes().toArray(new String[rule.getRuleTypes().size()]),
                 rule.getTitle(),
                 rule.getDescription(),
-                rule.getExecuteAsychronously(),
+                rule.getExecuteAsynchronously(),
-                webServiceConditions,
+                convertToWebServiceAction(rule.getAction()));
-                childWebServiceActions,
-                runAsUserName,
-                reference);
         
         return webServiceRule;
     }
@@ -1123,56 +1078,38 @@ public class ActionWebService extends AbstractWebService implements ActionServic
      * @return
      */
     private Rule convertToRule(org.alfresco.repo.webservice.action.Rule webServiceRule)
-    {
+    {        
-        // If the id is null then generate one
+        NodeRef ruleNodeRef = null;
-        String id = webServiceRule.getId();
+        if (webServiceRule.getRuleReference() != null)
-        if (id == null || id.length() == 0)
         {
-            id = GUID.generate();
+            ruleNodeRef = Utils.convertToNodeRef(
-        }
+                    webServiceRule.getRuleReference(), 
-        
+                    this.nodeService, 
-        // Get the owning node ref
+                    this.searchService, 
-        NodeRef owningNodeRef = null;
+                    this.namespaceService);
-        if (webServiceRule.getReference() != null)
-        {
-            owningNodeRef = Utils.convertToNodeRef(
-                webServiceRule.getReference(),
-                this.nodeService,
-                this.searchService,
-                this.namespaceService);
         }
         
         // Get the rule type name
-        String ruleTypeName = webServiceRule.getRuleType();
+        String[] ruleTypes = webServiceRule.getRuleTypes();
         
         // Create the rule
-        RuleImpl rule = new RuleImpl(id, ruleTypeName, owningNodeRef);
+        Rule rule = new Rule();
+        List<String> ruleTypesList = new ArrayList<String>(ruleTypes.length);
+        for (String ruleType : ruleTypes)
+        {
+            ruleTypesList.add(ruleType);
+        }
+        rule.setRuleTypes(ruleTypesList);
+        rule.setNodeRef(ruleNodeRef);    
         
         // Set some of the rules details
         rule.setTitle(webServiceRule.getTitle());
         rule.setDescription(webServiceRule.getDescription());
-        rule.setExecuteAsynchronously(webServiceRule.isExecuteAsynchronously());        
+        rule.setExecuteAsynchronously(webServiceRule.isExecuteAsynchronously());
         
-        // Set the conditions
+        // Set the action
-        Condition[] webServiceConditions = webServiceRule.getConditions();
+        Action action = convertToAction(webServiceRule.getAction());
-        if (webServiceConditions != null)
+        rule.setAction(action);
-        {
-            for (Condition webServiceCondition : webServiceConditions)
-            {
-                rule.addActionCondition(convertToActionCondition(webServiceCondition));
-            }
-        }
-        
-        // Set the child actions 
-        org.alfresco.repo.webservice.action.Action[] webServiceChildActions = webServiceRule.getActions();
-        if (webServiceChildActions != null)
-        {
-            for (org.alfresco.repo.webservice.action.Action webServiceChildAction : webServiceChildActions)
-            {
-                Action childAction = convertToAction(webServiceChildAction);
-                rule.addAction(childAction);
-            }
-        }
         
         return rule;
     }

source/java/org/alfresco/repo/webservice/authentication/AuthenticationWebService.java

@@ -68,10 +68,12 @@ public class AuthenticationWebService implements AuthenticationServiceSoapPort
         } 
         catch (AuthenticationException ae)
         {
+            ae.printStackTrace();
             throw new AuthenticationFault(100, ae.getMessage());
         } 
         catch (Throwable e)
         {
+            e.printStackTrace();
             throw new AuthenticationFault(0, e.getMessage());
         }
     }

source/java/org/alfresco/repo/webservice/repository/AssociatedQuerySession.java

@@ -111,13 +111,16 @@ public class AssociatedQuerySession extends AbstractQuerySession
                 // get the data for the row and build up the columns structure
                 Map<QName, Serializable> props = nodeService
                         .getProperties(childNodeRef);
-                NamedValue[] columns = new NamedValue[props.size()];
+                NamedValue[] columns = new NamedValue[props.size()+1];
                 int col = 0;
                 for (QName propName : props.keySet())
                 {
                     columns[col] = Utils.createNamedValue(dictionaryService, propName, props.get(propName)); 
                     col++;
                 }
+                
+                // Now add the system columns containing the association details
+                columns[col] = new NamedValue(SYS_COL_ASSOC_TYPE, Boolean.FALSE, assoc.getTypeQName().toString(), null);
 
                 ResultSetRow row = new ResultSetRow();
                 row.setRowIndex(x);

source/java/org/alfresco/repo/webservice/repository/ChildrenQuerySession.java

@@ -97,7 +97,7 @@ public class ChildrenQuerySession extends AbstractQuerySession
             // create columns for all the properties of the node
             // get the data for the row and build up the columns structure
             Map<QName, Serializable> props = nodeService.getProperties(childNodeRef);
-            NamedValue[] columns = new NamedValue[props.size()];
+            NamedValue[] columns = new NamedValue[props.size()+4];
             int col = 0;
             for (QName propName : props.keySet())
             {
@@ -105,6 +105,15 @@ public class ChildrenQuerySession extends AbstractQuerySession
                col++;
             }
             
+            // Now add the system columns containing the association details
+            columns[col] = new NamedValue(SYS_COL_ASSOC_TYPE, Boolean.FALSE, assoc.getTypeQName().toString(), null);
+            col++;
+            columns[col] = new NamedValue(SYS_COL_ASSOC_NAME, Boolean.FALSE, assoc.getQName().toString(), null);
+            col++;
+            columns[col] = new NamedValue(SYS_COL_IS_PRIMARY, Boolean.FALSE, Boolean.toString(assoc.isPrimary()), null);
+            col++;
+            columns[col] = new NamedValue(SYS_COL_NTH_SIBLING, Boolean.FALSE, Integer.toString(assoc.getNthSibling()), null);
+            
             ResultSetRow row = new ResultSetRow();
             row.setRowIndex(x);
             row.setNode(rowNode);

source/java/org/alfresco/repo/webservice/repository/ParentsQuerySession.java

@@ -97,7 +97,7 @@ public class ParentsQuerySession extends AbstractQuerySession
             // create columns for all the properties of the node
             // get the data for the row and build up the columns structure
             Map<QName, Serializable> props = nodeService.getProperties(parentNodeRef);
-            NamedValue[] columns = new NamedValue[props.size()];
+            NamedValue[] columns = new NamedValue[props.size()+4];
             int col = 0;
             for (QName propName : props.keySet())
             {
@@ -105,6 +105,15 @@ public class ParentsQuerySession extends AbstractQuerySession
                col++;
             }
             
+            // Now add the system columns containing the association details
+            columns[col] = new NamedValue(SYS_COL_ASSOC_TYPE, Boolean.FALSE, assoc.getTypeQName().toString(), null);
+            col++;
+            columns[col] = new NamedValue(SYS_COL_ASSOC_NAME, Boolean.FALSE, assoc.getQName().toString(), null);
+            col++;
+            columns[col] = new NamedValue(SYS_COL_IS_PRIMARY, Boolean.FALSE, Boolean.toString(assoc.isPrimary()), null);
+            col++;
+            columns[col] = new NamedValue(SYS_COL_NTH_SIBLING, Boolean.FALSE, Integer.toString(assoc.getNthSibling()), null);
+            
             ResultSetRow row = new ResultSetRow();
             row.setRowIndex(x);
             row.setNode(rowNode);

source/java/org/alfresco/repo/webservice/repository/QuerySession.java

@@ -30,6 +30,12 @@ import org.alfresco.service.namespace.NamespaceService;
  */
 public interface QuerySession extends Serializable
 {
+    /** System column namess */
+    public static String SYS_COL_ASSOC_TYPE = "associationType";
+    public static String SYS_COL_ASSOC_NAME = "associationName";
+    public static String SYS_COL_IS_PRIMARY = "isPrimary";
+    public static String SYS_COL_NTH_SIBLING = "nthSibling";
+    
    /**
     * Retrieves the id this query session can be identified as
     * 

source/java/org/alfresco/repo/webservice/repository/RepositoryWebService.java

@@ -35,10 +35,8 @@ import org.alfresco.repo.webservice.types.Node;
 import org.alfresco.repo.webservice.types.NodeDefinition;
 import org.alfresco.repo.webservice.types.Predicate;
 import org.alfresco.repo.webservice.types.Query;
-import org.alfresco.repo.webservice.types.QueryLanguageEnum;
 import org.alfresco.repo.webservice.types.Reference;
 import org.alfresco.repo.webservice.types.Store;
-import org.alfresco.repo.webservice.types.StoreEnum;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.TypeDefinition;
@@ -103,14 +101,10 @@ public class RepositoryWebService extends AbstractWebService implements
     /**
      * @see org.alfresco.repo.webservice.repository.RepositoryServiceSoapPort#createStore(org.alfresco.repo.webservice.types.StoreEnum, java.lang.String)
      */
-    public Store createStore(StoreEnum scheme, String address) throws RemoteException, RepositoryFault
+    public Store createStore(String scheme, String address) throws RemoteException, RepositoryFault
     {
-        String protocol = scheme.getValue();
+        StoreRef storeRef = this.nodeService.createStore(scheme, address);
-        StoreRef storeRef = this.nodeService.createStore(protocol, address);
+        return Utils.convertToStore(storeRef);
-        
-        StoreEnum storeEnum = StoreEnum.fromString(storeRef
-                .getProtocol());
-        return new Store(storeEnum, storeRef.getIdentifier());
     }
 
     /**
@@ -136,9 +130,7 @@ public class RepositoryWebService extends AbstractWebService implements
                     logger.debug("Store protocol :" + storeRef.getProtocol());
                 }
                 
-                StoreEnum storeEnum = StoreEnum.fromString(storeRef
+                Store store = Utils.convertToStore(storeRef);
-                        .getProtocol());
-                Store store = new Store(storeEnum, storeRef.getIdentifier());
                 returnStores[x] = store;
             }
 
@@ -175,13 +167,11 @@ public class RepositoryWebService extends AbstractWebService implements
     public QueryResult query(Store store, Query query, boolean includeMetaData)
             throws RemoteException, RepositoryFault
     {
-        QueryLanguageEnum langEnum = query.getLanguage();
+        String language = query.getLanguage();
-
+        if (language.equals(Utils.QUERY_LANG_LUCENE) == false)
-        if (langEnum.equals(QueryLanguageEnum.cql)
-                || langEnum.equals(QueryLanguageEnum.xpath))
         {
             throw new RepositoryFault(110, "Only '"
-                    + QueryLanguageEnum.lucene.getValue()
+                    + Utils.QUERY_LANG_LUCENE
                     + "' queries are currently supported!");
         }
 
@@ -275,6 +265,8 @@ public class RepositoryWebService extends AbstractWebService implements
             return queryResult;
         } catch (Throwable e)
         {
+            e.printStackTrace();
+            
             // rollback the transaction
             try
             {

source/java/org/alfresco/repo/webservice/repository/ResultSetQuerySession.java

@@ -90,7 +90,7 @@ public class ResultSetQuerySession extends AbstractQuerySession
          try
          {
             searchResults = searchService.query(Utils.convertToStoreRef(this.store), 
-                  this.query.getLanguage().getValue(), statement);
+                  this.query.getLanguage(), statement);
          
             int totalRows = searchResults.length();
             int lastRow = calculateLastRowIndex(totalRows);
@@ -174,8 +174,8 @@ public class ResultSetQuerySession extends AbstractQuerySession
       builder.append(" (id=").append(getId());
       builder.append(" batchSize=").append(this.batchSize);
       builder.append(" position=").append(this.position);
-      builder.append(" store=").append(this.store.getScheme().getValue()).append(":").append(this.store.getAddress());
+      builder.append(" store=").append(this.store.getScheme()).append(":").append(this.store.getAddress());
-      builder.append(" language=").append(this.query.getLanguage().getValue());
+      builder.append(" language=").append(this.query.getLanguage());
       builder.append(" statement=").append(this.query.getStatement());
       builder.append(")");
       return builder.toString();

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

@@ -49,6 +49,9 @@
       <property name="dictionaryService">
          <ref bean="DictionaryService"/>
       </property>
+      <property name="contentService">
+      	<ref bean="ContentService"/>
+      </property>
    </bean>
    
    <!-- Implementations of each exposed web service -->

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

@@ -28,14 +28,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -156,14 +148,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -441,7 +425,7 @@
       	<handler type="QueryConfigHandler"/>
   		</requestFlow>
 	   <!-- generated below here -->
-	     <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/repository/1.0"/>
+	  <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/repository/1.0"/>
       <parameter name="wsdlServiceElement" value="RepositoryService"/>
       <parameter name="schemaQualified" value="http://www.alfresco.org/ws/service/repository/1.0,http://www.alfresco.org/ws/headers/1.0,http://www.alfresco.org/ws/model/content/1.0,http://www.alfresco.org/ws/cml/1.0"/>
       <parameter name="wsdlServicePort" value="RepositoryService"/>
@@ -449,7 +433,7 @@
       <parameter name="wsdlPortType" value="RepositoryServiceSoapPort"/>
       <parameter name="typeMappingVersion" value="1.2"/>
       <operation name="createStore" qname="operNS:createStore" xmlns:operNS="http://www.alfresco.org/ws/service/repository/1.0" returnQName="retNS:createStoreReturn" xmlns:retNS="http://www.alfresco.org/ws/service/repository/1.0" returnType="rtns:Store" xmlns:rtns="http://www.alfresco.org/ws/model/content/1.0" soapAction="http://www.alfresco.org/ws/service/repository/1.0/createStore" >
-        <parameter qname="pns:scheme" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:StoreEnum" xmlns:tns="http://www.alfresco.org/ws/model/content/1.0"/>
+        <parameter qname="pns:scheme" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <parameter qname="pns:address" xmlns:pns="http://www.alfresco.org/ws/service/repository/1.0" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"/>
         <fault name="RepositoryFault" qname="fns:RepositoryFault" xmlns:fns="http://www.alfresco.org/ws/service/repository/1.0" class="org.alfresco.repo.webservice.repository.RepositoryFault" type="tns:RepositoryFault" xmlns:tns="http://www.alfresco.org/ws/service/repository/1.0"/>
       </operation>
@@ -501,14 +485,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>move"
@@ -820,14 +796,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/cml/1.0"
         qname="ns:>CML>removeAssociation"
@@ -953,14 +921,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -1089,14 +1049,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -1302,14 +1254,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -1470,14 +1414,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -1647,14 +1583,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -1775,14 +1703,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -1922,7 +1842,7 @@
       	  <handler type="WSSecurity"/>
   		</requestFlow>
 	   <!-- generated below here -->
-       <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/action/1.0"/>
+        <parameter name="wsdlTargetNamespace" value="http://www.alfresco.org/ws/service/action/1.0"/>
       <parameter name="wsdlServiceElement" value="ActionService"/>
       <parameter name="schemaQualified" value="http://www.alfresco.org/ws/service/action/1.0,http://www.alfresco.org/ws/model/content/1.0"/>
       <parameter name="wsdlServicePort" value="ActionService"/>
@@ -1992,14 +1912,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -2168,14 +2080,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -2320,7 +2224,7 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-    </service>
+  </service>
     
     <service name="AccessControlService" provider="java:SpringRPC" style="wrapped" use="literal">
 	   <documentation>Access control web service API.</documentation>
@@ -2390,14 +2294,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Cardinality"
@@ -2558,14 +2454,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -2753,14 +2641,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -2905,14 +2785,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"
@@ -3074,14 +2946,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:QueryLanguageEnum"
-        type="java:org.alfresco.repo.webservice.types.QueryLanguageEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:ClassDefinition"
@@ -3210,14 +3074,6 @@
         deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
         encodingStyle=""
       />
-      <typeMapping
-        xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
-        qname="ns:StoreEnum"
-        type="java:org.alfresco.repo.webservice.types.StoreEnum"
-        serializer="org.apache.axis.encoding.ser.EnumSerializerFactory"
-        deserializer="org.apache.axis.encoding.ser.EnumDeserializerFactory"
-        encodingStyle=""
-      />
       <typeMapping
         xmlns:ns="http://www.alfresco.org/ws/model/content/1.0"
         qname="ns:Reference"

source/wsdl/access-control-service.wsdl

@@ -11,7 +11,7 @@
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="types.xsd"/>
+   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="../wsdl/types.xsd"/>
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/accesscontrol/1.0" xmlns="http://www.w3.org/2001/XMLSchema">
 

source/wsdl/action-service.wsdl

@@ -11,7 +11,7 @@
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="types.xsd"/>
+   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="../wsdl/types.xsd"/>
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/action/1.0" xmlns="http://www.w3.org/2001/XMLSchema">
 
@@ -58,16 +58,15 @@
 
          <complexType name="Action">
             <sequence>
+               <element name="actionReference" type="cms:Reference" nillable="true"/>
                <element name="id" type="xsd:string" nillable="true"/>
                <element name="actionName" type="xsd:string"/>
                <element name="title" type="xsd:string" nillable="true"/>
                <element name="description" type="xsd:string" nillable="true"/>
-               <element name="executeAsynchronously" type="xsd:boolean"/>
                <element name="parameters" type="cms:NamedValue" maxOccurs="unbounded" minOccurs="0" nillable="true"/>
                <element name="conditions" type="action:Condition" maxOccurs="unbounded" minOccurs="0" nillable="true"/>
                <element name="compensatingAction" type="action:Action" nillable="true"/>
                <element name="actions" type="action:Action" maxOccurs="unbounded" minOccurs="0" nillable="true"/>
-               <element name="reference" type="cms:Reference" nillable="true"/>
             </sequence>
          </complexType>
          <element name="Action" type="action:Action"/>
@@ -82,15 +81,13 @@
 
          <complexType name="Rule">
             <sequence>
-               <element name="id" type="xsd:string" nillable="true"/>
+               <element name="ruleReference" type="cms:Reference" nillable="true"/>               
-               <element name="ruleType" type="xsd:string"/>
+               <element name="owningReference" type="cms:Reference" nillable="true"/>
+               <element name="ruleTypes" type="xsd:string" maxOccurs="unbounded" minOccurs="1"/>
                <element name="title" type="xsd:string" nillable="true"/>
                <element name="description" type="xsd:string" nillable="true"/>
                <element name="executeAsynchronously" type="xsd:boolean"/>
-               <element name="conditions" type="action:Condition" maxOccurs="unbounded" minOccurs="0" nillable="true"/>
+               <element name="action" type="action:Action"/>
-               <element name="actions" type="action:Action" maxOccurs="unbounded" minOccurs="1"/>
-               <element name="runAsUserName" type="xsd:string" nillable="true"/>
-               <element name="reference" type="cms:Reference" nillable="true"/>
             </sequence>
          </complexType>
          <element name="Rule" type="action:Rule"/>

source/wsdl/administration-service.wsdl

@@ -11,7 +11,7 @@
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="types.xsd"/>
+   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="../wsdl/types.xsd"/>
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/administration/1.0" xmlns="http://www.w3.org/2001/XMLSchema">
 

source/wsdl/authoring-service.wsdl

@@ -11,7 +11,7 @@
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/ws/cml/1.0" location="types.xsd"/>
+   <wsdl:import namespace="http://www.alfresco.org/ws/cml/1.0" location="../wsdl/types.xsd"/>
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/authoring/1.0" xmlns="http://www.w3.org/2001/XMLSchema">
          <element name="checkout">

source/wsdl/classification-service.wsdl

@@ -11,7 +11,7 @@
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="types.xsd"/>
+   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="../wsdl/types.xsd"/>
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/classification/1.0" xmlns="http://www.w3.org/2001/XMLSchema">
          <element name="getClassifications">

source/wsdl/cml.xsd

@@ -52,7 +52,18 @@
 						<xsd:group ref="cml:Where"></xsd:group>
 					</xsd:sequence>
 				</xsd:complexType>
-			</xsd:element>
+			</xsd:element>
+			
+			<xsd:element name="writeContent" maxOccurs="unbounded" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+	                  <xsd:element name="property" type="xsd:string"/>
+	                  <xsd:element name="content" type="xsd:base64Binary"/>
+	                  <xsd:element name="format" type="cms:ContentFormat"/>
+					  <xsd:group ref="cml:Where"></xsd:group>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>				
 			
 			<xsd:element name="delete" maxOccurs="unbounded" minOccurs="0">
 				<xsd:complexType>
@@ -94,8 +105,8 @@
 				<xsd:complexType>
 					<xsd:sequence>
 						<xsd:choice>
-							<xsd:element name="from" type="cms:Reference"></xsd:element>
+							<xsd:element name="from" type="cms:Reference" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
-							<xsd:element name="from_id" type="xsd:string"></xsd:element>
+							<xsd:element name="from_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 						</xsd:choice>
 						<xsd:group ref="cml:Where"></xsd:group>
 					</xsd:sequence>
@@ -159,31 +170,31 @@
 	
 	<xsd:group name="Where">
 		<xsd:choice>
-			<xsd:element name="where" type="cms:Predicate"></xsd:element>
+			<xsd:element name="where" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
-			<xsd:element name="where_id" type="xsd:string"></xsd:element>
+			<xsd:element name="where_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 		</xsd:choice>
 	</xsd:group>
 	
 	<xsd:group name="From">
 		<xsd:choice>
-			<xsd:element name="from" type="cms:Predicate"></xsd:element>
+			<xsd:element name="from" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
-			<xsd:element name="from_id" type="xsd:string"></xsd:element>
+			<xsd:element name="from_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 		</xsd:choice>
 	</xsd:group>
 
 	<xsd:group name="To">
 		<xsd:choice>
-			<xsd:element name="to" type="cms:Predicate"></xsd:element>
+			<xsd:element name="to" type="cms:Predicate" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
-			<xsd:element name="to_id" type="xsd:string"></xsd:element>
+			<xsd:element name="to_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 		</xsd:choice>
 	</xsd:group>
 
 	<xsd:group name="ToParent">
 		<xsd:choice>
-			<xsd:element name="to" type="cms:ParentReference"></xsd:element>
+			<xsd:element name="to" type="cms:ParentReference" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 			<xsd:sequence>
-				<xsd:element name="to_id" type="xsd:string"></xsd:element>
+				<xsd:element name="to_id" type="xsd:string" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
-				<xsd:group ref="cms:ChildAssociation"></xsd:group>
+				<xsd:group ref="cms:ChildAssociation" maxOccurs="1" minOccurs="0" nillable="true"></xsd:group>
 			</xsd:sequence>
 		</xsd:choice>
 	</xsd:group>							

source/wsdl/content-service.wsdl

@@ -11,7 +11,7 @@
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="types.xsd"/>
+   <wsdl:import namespace="http://www.alfresco.org/ws/model/content/1.0" location="../wsdl/types.xsd"/>
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/content/1.0" xmlns="http://www.w3.org/2001/XMLSchema">         
        

source/wsdl/dictionary-service.wsdl

@@ -11,7 +11,7 @@
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/model/content/1.0" location="types.xsd" />
+   <wsdl:import namespace="http://www.alfresco.org/model/content/1.0" location="../wsdl/types.xsd" />
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/dictionary/1.0" xmlns="http://www.w3.org/2001/XMLSchema">
          

source/wsdl/repository-service.wsdl

@@ -13,15 +13,15 @@
    <!-- ************************************** -->
    <!-- Copyright Alfresco Software, Inc. 2005 -->
    <!-- ************************************** -->
-   <wsdl:import namespace="http://www.alfresco.org/ws/headers/1.0" location="headers.xsd" />
+   <wsdl:import namespace="http://www.alfresco.org/ws/headers/1.0" location="../wsdl/headers.xsd" />
-   <wsdl:import namespace="http://www.alfresco.org/ws/cml/1.0" location="cml.xsd"/>
+   <wsdl:import namespace="http://www.alfresco.org/ws/cml/1.0" location="../wsdl/cml.xsd"/>
    <wsdl:types>
       <schema elementFormDefault="qualified" targetNamespace="http://www.alfresco.org/ws/service/repository/1.0" xmlns="http://www.w3.org/2001/XMLSchema">
          
          <element name="createStore">
          	<complexType>
                <sequence>
-                  <element name="scheme" type="cms:StoreEnum"/>
+                  <element name="scheme" type="xsd:string"/>
                   <element name="address" type="xsd:string"/>
                </sequence>
             </complexType>
@@ -192,6 +192,7 @@
             <sequence>
                <element name="statement" type="xsd:string"/>
                <element name="updateCount" type="cms:ResultSet" nillable="true"/>
+               <element name="sourceId" type="xsd:string" nillable="true"/>
                <element name="source" type="cms:Reference" nillable="true"/>
                <element name="destination" type="cms:Reference" nillable="true"/>
             </sequence>

source/wsdl/types.xsd

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:cms="http://www.alfresco.org/ws/model/content/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.alfresco.org/ws/model/content/1.0" elementFormDefault="qualified" version="0.1">
     <xsd:annotation>
     	<xsd:documentation>Alfresco Web Services for Content Management. Type Definitions - Draft.</xsd:documentation>
@@ -31,36 +30,19 @@
 			<xsd:minLength value="1"/>
 		</xsd:restriction>
 	</xsd:simpleType>
-
-    <xsd:simpleType name="StoreEnum">
-    	<xsd:restriction base="xsd:string">
-    		<xsd:enumeration value="workspace"/>
-    		<xsd:enumeration value="versionStore"/>
-    		<xsd:enumeration value="user"/>
-    		<xsd:enumeration value="search"/>
-    		<xsd:enumeration value="http"/>
-    		<xsd:enumeration value="system"/>
-    	</xsd:restriction>
-    </xsd:simpleType>
     
     <xsd:complexType name="Store">
     	<xsd:sequence>
-    		<xsd:element name="scheme" type="cms:StoreEnum"/>
+    		<xsd:element name="scheme" type="xsd:string"/>
-    		<xsd:element name="address">
+    		<xsd:element name="address" type="xsd:string"/>
-    			<xsd:simpleType>
-    				<xsd:restriction base="xsd:string">
-    					<xsd:minLength value="1"/>
-    				</xsd:restriction>
-    			</xsd:simpleType>
-    		</xsd:element>
     	</xsd:sequence>
     </xsd:complexType>
 
     <xsd:complexType name="Reference">
     	<xsd:sequence>
     		<xsd:element name="store" type="cms:Store"/>
-    		<xsd:element maxOccurs="1" minOccurs="0" name="uuid" type="cms:UUID"/>
+    		<xsd:element maxOccurs="1" minOccurs="0" name="uuid" type="cms:UUID" nillable="true"/>
-    		<xsd:element default="/" maxOccurs="1" minOccurs="0" name="path" type="cms:Path"/>
+    		<xsd:element default="/" maxOccurs="1" minOccurs="0" name="path" type="cms:Path" nillable="true"/>
     	</xsd:sequence>
     </xsd:complexType>
 
@@ -218,17 +200,9 @@
 	<!-- Query Definitions -->
 	<!-- -->
 
-    <xsd:simpleType name="QueryLanguageEnum">
-    	<xsd:restriction base="xsd:string">
-    		<xsd:enumeration value="lucene"/>
-    		<xsd:enumeration value="xpath"/>
-    		<xsd:enumeration value="cql"/>
-    	</xsd:restriction>
-    </xsd:simpleType>
-
     <xsd:complexType name="Query">
     	<xsd:sequence>
-    		<xsd:element name="language" type="cms:QueryLanguageEnum"/>
+    		<xsd:element name="language" type="xsd:string"/>
     		<xsd:element name="statement" type="xsd:string"/>
     	</xsd:sequence>
     </xsd:complexType>
@@ -269,8 +243,8 @@
 			<xsd:element name="nodes" type="cms:Reference" maxOccurs="unbounded" minOccurs="0" nillable="true">
 			</xsd:element>
 			<xsd:sequence>
-				<xsd:element name="store" type="cms:Store" minOccurs="0" nillable="true"></xsd:element>
+				<xsd:element name="store" type="cms:Store" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
-				<xsd:element name="query" type="cms:Query" minOccurs="0" nillable="true"></xsd:element>
+				<xsd:element name="query" type="cms:Query" maxOccurs="1" minOccurs="0" nillable="true"></xsd:element>
 			</xsd:sequence>
 		</xsd:choice>
 	</xsd:complexType>