Merged V2.2 to HEAD

8146: Interim checkin for Oracle upgrade scripts.
   8150: AR-1905
   8151: AR-1956
   8152: Correct I18N when reporting patch description
   8153: QName script for Oracle along with fixes for unique constraints on assoc tables
   8155: Upgrade scripts for Oracle V2.2 - almost there
   8164: AWC-1633: Unable to edit rule added via web service
   8166: V2.2 upgrade scripts for MySQL and Oracle
   8170: AWC-1515: E-mail doesn't reach user's mail box, if it was created with the help of templates
   8174: Fix for AWC-798
   8180: Fix for AWC-1843
   8183: Fixes for different unique index names on alf_child_assoc
   8189: AWC-1719: Need to alllow Rules to account for a space being deleted
   8249: Fixed handling of empty namespaces on Oracle
   8259: Fixes for null namespaces in QName
   8360: Modified alf_audit_date columns and added patch
   8404: Fix AR-2133: Fix handling of empty namespaces during upgrade


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

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

@@ -183,7 +183,7 @@ public class Condition  implements java.io.Serializable {
         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"));
-        elemField.setNillable(false);
+        elemField.setNillable(true);
         typeDesc.addFieldDesc(elemField);
         elemField = new org.apache.axis.description.ElementDesc();
         elemField.setFieldName("conditionName");

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

@@ -669,6 +669,8 @@ public class ActionWebService extends AbstractWebService implements ActionServic
         
         // Set the parameters
         NamedValue[] namedValues = webServiceAction.getParameters();
+        if (namedValues != null)
+        {
             for (NamedValue namedValue : namedValues)
             {
                 // Get the type of the property
@@ -694,6 +696,7 @@ public class ActionWebService extends AbstractWebService implements ActionServic
                 // Set the parameter
                 action.setParameterValue(namedValue.getName(), value);
             }
+        }
         
         // Set the conditions
         Condition[] webServiceConditions = webServiceAction.getConditions();
@@ -752,6 +755,8 @@ public class ActionWebService extends AbstractWebService implements ActionServic
         
         // Set the condition parameters
         NamedValue[] namedValues = webServiceCondition.getParameters();
+        if (namedValues != null)
+        {
             for (NamedValue namedValue : namedValues)
             {
                 // Get the type of the property
@@ -777,6 +782,7 @@ public class ActionWebService extends AbstractWebService implements ActionServic
                 // Set the parameter
                 actionCondition.setParameterValue(namedValue.getName(), value);
             }
+        }
         
         return actionCondition;
     }
@@ -1025,6 +1031,8 @@ public class ActionWebService extends AbstractWebService implements ActionServic
         }
         catch (Throwable exception)
         {
+            exception.printStackTrace();
+            
             if (logger.isDebugEnabled())
             {
                 logger.error("Unexpected error occurred", exception);

source/wsdl/action-service.wsdl

@@ -50,7 +50,7 @@
 
          <complexType name="Condition">
             <sequence>
-               <element name="id" type="xsd:string"/>
+               <element name="id" type="xsd:string" nillable="true"/>
                <element name="conditionName" type="xsd:string"/>
                <element name="invertCondition" type="xsd:boolean"/>
                <element name="parameters" type="cms:NamedValue" maxOccurs="unbounded" minOccurs="0" nillable="true"/>