Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -54,6 +54,11 @@ public abstract class ParameterizedItemAbstractBase extends CommonResourceAbstra
*/
protected RuntimeActionService runtimeActionService;
/**
* Indicates whether or not ad-hoc properties can be provided. Default so false.
*/
protected boolean adhocPropertiesAllowed = false;
/**
* @return Return a short title and description string
*/
@@ -116,6 +121,16 @@ public abstract class ParameterizedItemAbstractBase extends CommonResourceAbstra
return this.name + "." + DESCRIPTION;
}
/**
* Setter for Spring injection of adhocPropertiesAllowed property
*
* @param allowed
*/
public void setAdhocPropertiesAllowed(boolean allowed)
{
this.adhocPropertiesAllowed = allowed;
}
/**
* Indicates whether adhoc property definitions are allowed or not
*
@@ -124,7 +139,7 @@ public abstract class ParameterizedItemAbstractBase extends CommonResourceAbstra
protected boolean getAdhocPropertiesAllowed()
{
// By default adhoc properties are not allowed
return false;
return this.adhocPropertiesAllowed;
}
/**