Merge V3.2 To HEAD

17841: ETHREEOH-3183 - No way to cleanly override version labeling policy for cm:content
    - version properties are now injected, not hard coded.
   17844: missed from last check in.

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

source/java/org/alfresco/service/cmr/version/VersionService.java

@@ -28,6 +28,7 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.Map;
 
+import org.alfresco.repo.version.VersionServicePolicies.CalculateVersionLabelPolicy;
 import org.alfresco.service.Auditable;
 import org.alfresco.service.PublicService;
 import org.alfresco.service.cmr.repository.AspectMissingException;
@@ -297,4 +298,12 @@ public interface VersionService
      */
     @Auditable(key = Auditable.Key.ARG_0, parameters = {"nodeRef", "version"})
     public void deleteVersion(NodeRef nodeRef, Version version);
+    
+    /**
+     * Register a version label policy
+     * 
+     * @param typeQName the QName of the type to register
+     * @param policy the policy to register for the specified type
+     */
+    public void registerVersionLabelPolicy(QName typeQName, CalculateVersionLabelPolicy policy);
 }