Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
   svn revert root\common\common.xml
   svn resolved root\projects\repository\config\alfresco\script-services-context.xml


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

source/java/org/alfresco/repo/policy/registration/AssociationPolicyRegistration.java

@@ -0,0 +1,46 @@
+/**
+ * 
+ */
+package org.alfresco.repo.policy.registration;
+
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Deals with the registration of an association policy
+ * 
+ * @author Roy Wetherall
+ *
+ */
+public class AssociationPolicyRegistration extends PolicyRegistration 
+{
+	/** The association type **/
+	private QName associationType;
+	
+	/**
+	 * Set the association type
+	 * 
+	 * @param associationType	the association type
+	 */
+	public void setAssociationType(String associationType) 
+	{
+		this.associationType = QName.createQName(associationType);
+	}
+	
+	/**
+	 * @see org.alfresco.repo.policy.registration.PolicyRegistration#register()
+	 */
+	@Override
+	public void register() 
+	{
+		// Register the association behaviour
+		if (this.associationType == null)
+		{		
+			this.policyComponent.bindAssociationBehaviour(this.policyName, this.className, this.behaviour);
+		}
+		else
+		{
+			this.policyComponent.bindAssociationBehaviour(this.policyName, this.className, this.associationType, this.behaviour);
+		}
+	}
+
+}

source/java/org/alfresco/repo/policy/registration/ClassPolicyRegistration.java

@@ -0,0 +1,24 @@
+/**
+ * 
+ */
+package org.alfresco.repo.policy.registration;
+
+/**
+ * Deal with the registration of a class policy
+ * 
+ * @author Roy Wetherall
+ *
+ */
+public class ClassPolicyRegistration extends PolicyRegistration 
+{
+	/**
+	 * @see org.alfresco.repo.policy.registration.PolicyRegistration#register()
+	 */
+	@Override
+	public void register() 
+	{
+		// Register the class behaviour
+		this.policyComponent.bindClassBehaviour(this.policyName, this.className, this.behaviour);
+	}
+
+}

source/java/org/alfresco/repo/policy/registration/PolicyRegistration.java

@@ -0,0 +1,76 @@
+/**
+ * 
+ */
+package org.alfresco.repo.policy.registration;
+
+import org.alfresco.repo.policy.Behaviour;
+import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Bean that can be configured in spring to register a policy bahaviour
+ * 
+ * @author Roy Wetherall
+ */
+public abstract class PolicyRegistration 
+{
+	/** The policy componenet **/
+	protected PolicyComponent policyComponent;
+	
+	/** The policy name **/
+	protected QName policyName;
+	
+	/** The class name **/
+	protected QName className;
+	
+	/** The behaviour **/
+	protected Behaviour behaviour;
+	
+	/**
+	 * Set the policy component
+	 * 
+	 * @param policyComponent	the policy componenet
+	 */
+	public void setPolicyComponent(PolicyComponent policyComponent) 
+	{
+		this.policyComponent = policyComponent;
+	}
+	
+	/**
+	 * Set the policy name
+	 * 
+	 * @param policyName	the policy name
+	 */
+	public void setPolicyName(String policyName)
+	{
+		this.policyName = QName.createQName(policyName);
+	}
+	
+	/**
+	 * Set the class name
+	 * 
+	 * @param className		 the class name
+	 */
+	public void setClassName(String className)
+	{
+		this.className = QName.createQName(className);
+	}
+	
+	/**
+	 * Set the behaviour
+	 * 
+	 * @param behaviour	the behaviour
+	 */
+	public void setBehaviour(Behaviour behaviour) 
+	{
+		this.behaviour = behaviour;
+	}
+	
+	/**
+	 * Registers the behaviour with the policy component for the policy and type specified.  Called
+	 * as the init method of the bean.
+	 * 
+	 * TODO supoort service registration?
+	 */
+	public abstract void register();
+}