inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2008-03-10 15:32:55 +00:00
parent 2b7b96eb45
commit 9561a00e64
3 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/generated/org/alfresco/repo/webservice/action/Condition.java
View File

@@ -183,7 +183,7 @@ public class Condition implements java.io.Serializable {
elemField.setFieldName("id"); elemField.setFieldName("id");
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", "id"));
elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
elemField.setNillable(false); elemField.setNillable(true);
typeDesc.addFieldDesc(elemField); typeDesc.addFieldDesc(elemField);
elemField = new org.apache.axis.description.ElementDesc(); elemField = new org.apache.axis.description.ElementDesc();
elemField.setFieldName("conditionName"); elemField.setFieldName("conditionName");

88
source/java/org/alfresco/repo/webservice/action/ActionWebService.java
View File

@@ -669,30 +669,33 @@ public class ActionWebService extends AbstractWebService implements ActionServic
// Set the parameters // Set the parameters
NamedValue[] namedValues = webServiceAction.getParameters(); NamedValue[] namedValues = webServiceAction.getParameters();
for (NamedValue namedValue : namedValues) if (namedValues != null)
{ {
// Get the type of the property for (NamedValue namedValue : namedValues)
DataTypeDefinition propertyType = null;
ActionDefinition actionDefintion = this.actionService.getActionDefinition(action.getActionDefinitionName());
ParameterDefinition propertyDefintion = actionDefintion.getParameterDefintion(namedValue.getName());
if (propertyDefintion != null)
{ {
propertyType = this.dictionaryService.getDataType(propertyDefintion.getType()); // Get the type of the property
} DataTypeDefinition propertyType = null;
ActionDefinition actionDefintion = this.actionService.getActionDefinition(action.getActionDefinitionName());
ParameterDefinition propertyDefintion = actionDefintion.getParameterDefintion(namedValue.getName());
if (propertyDefintion != null)
{
propertyType = this.dictionaryService.getDataType(propertyDefintion.getType());
}
// Convert the value into the correct type // Convert the value into the correct type
Serializable value = null; Serializable value = null;
if (propertyType != null) if (propertyType != null)
{ {
value = (Serializable)DefaultTypeConverter.INSTANCE.convert(propertyType, namedValue.getValue()); value = (Serializable)DefaultTypeConverter.INSTANCE.convert(propertyType, namedValue.getValue());
} }
else else
{ {
value = namedValue.getValue(); value = namedValue.getValue();
} }
// Set the parameter // Set the parameter
action.setParameterValue(namedValue.getName(), value); action.setParameterValue(namedValue.getName(), value);
}
} }
// Set the conditions // Set the conditions
@@ -752,30 +755,33 @@ public class ActionWebService extends AbstractWebService implements ActionServic
// Set the condition parameters // Set the condition parameters
NamedValue[] namedValues = webServiceCondition.getParameters(); NamedValue[] namedValues = webServiceCondition.getParameters();
for (NamedValue namedValue : namedValues) if (namedValues != null)
{ {
// Get the type of the property for (NamedValue namedValue : namedValues)
DataTypeDefinition propertyType = null;
ActionConditionDefinition actionConditionDefintion = this.actionService.getActionConditionDefinition(actionCondition.getActionConditionDefinitionName());
ParameterDefinition propertyDefintion = actionConditionDefintion.getParameterDefintion(namedValue.getName());
if (propertyDefintion != null)
{ {
propertyType = this.dictionaryService.getDataType(propertyDefintion.getType()); // Get the type of the property
} DataTypeDefinition propertyType = null;
ActionConditionDefinition actionConditionDefintion = this.actionService.getActionConditionDefinition(actionCondition.getActionConditionDefinitionName());
ParameterDefinition propertyDefintion = actionConditionDefintion.getParameterDefintion(namedValue.getName());
if (propertyDefintion != null)
{
propertyType = this.dictionaryService.getDataType(propertyDefintion.getType());
}
// Convert the value into the correct type // Convert the value into the correct type
Serializable value = null; Serializable value = null;
if (propertyType != null) if (propertyType != null)
{ {
value = (Serializable)DefaultTypeConverter.INSTANCE.convert(propertyType, namedValue.getValue()); value = (Serializable)DefaultTypeConverter.INSTANCE.convert(propertyType, namedValue.getValue());
} }
else else
{ {
value = namedValue.getValue(); value = namedValue.getValue();
} }
// Set the parameter // Set the parameter
actionCondition.setParameterValue(namedValue.getName(), value); actionCondition.setParameterValue(namedValue.getName(), value);
}
} }
return actionCondition; return actionCondition;
@@ -1025,6 +1031,8 @@ public class ActionWebService extends AbstractWebService implements ActionServic
} }
catch (Throwable exception) catch (Throwable exception)
{ {
exception.printStackTrace();
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.error("Unexpected error occurred", exception); logger.error("Unexpected error occurred", exception);

2
source/wsdl/action-service.wsdl
View File

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