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

config/alfresco/core-services-context.xml

@@ -893,7 +893,7 @@
     <!--  Version Service   -->
     <!--                               -->
 
-
+ 
     <bean id="versionService" class="org.alfresco.repo.version.Version2ServiceImpl" init-method="initialise">
         <property name="nodeService">
             <ref bean="NodeService" />
@@ -935,6 +935,41 @@
             <ref bean="dictionaryService" />
         </property>
     </bean>
+
+    <bean id="serialVersionLabelPolicy" class="org.alfresco.repo.version.common.versionlabel.SerialVersionLabelPolicy" >
+    </bean>
+    
+    <bean id="registerContentWithVersionService" class="org.alfresco.repo.version.VersionServiceVersionLabelRegistrationBean" init-method="register"> 
+       <property name="versionService">
+            <ref bean="versionService" />
+        </property>
+        <property name="namespacePrefixResolver">
+            <ref bean="namespaceService" />
+        </property>
+        <property name="typeQName">
+            <value>cm:content</value>
+        </property>
+        <property name="policy">
+             <ref bean="serialVersionLabelPolicy" />
+        </property>
+    </bean>
+    
+    <bean id="registerMLContainerWithVersionService" class="org.alfresco.repo.version.VersionServiceVersionLabelRegistrationBean" init-method="register"> 
+       <property name="versionService">
+            <ref bean="versionService" />
+        </property>
+        <property name="namespacePrefixResolver">
+            <ref bean="namespaceService" />
+        </property>
+        <property name="typeQName">
+            <value>cm:mlContainer</value>
+        </property>
+        <property name="policy">
+             <ref bean="serialVersionLabelPolicy" />
+        </property>
+    </bean>
+    
+    <!--  -->
     
     <bean id="versionMigrator" class="org.alfresco.repo.version.VersionMigrator" init-method="init">
         <property name="dbNodeService">

source/java/org/alfresco/repo/version/VersionServiceVersionLabelRegistrationBean.java

@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing
+ */
+package org.alfresco.repo.version;
+
+import org.alfresco.repo.version.VersionServicePolicies.CalculateVersionLabelPolicy;
+import org.alfresco.service.cmr.version.VersionService;
+import org.alfresco.service.namespace.NamespacePrefixResolver;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.PropertyCheck;
+
+/**
+ * Utility class to register a version label policy version service.
+ * 
+ * Used to configure the version service via spring.
+ * 
+ */
+public class VersionServiceVersionLabelRegistrationBean 
+{
+	private String typeQName;
+	
+	private CalculateVersionLabelPolicy policy;
+	
+	private VersionService versionService;
+	
+	private NamespacePrefixResolver prefixResolver;
+	
+	/**
+	 * Register the deployment target with the deployment target registry
+	 */
+	public void register()
+	{
+		PropertyCheck.mandatory(this, "typeQName", typeQName);
+		PropertyCheck.mandatory(this, "versionService", getVersionService());
+		PropertyCheck.mandatory(this, "policy", policy);
+	    PropertyCheck.mandatory(this, "prefixResolver", prefixResolver);
+		
+		/**
+		 * Go ahead and register the version label policy with the 
+		 * versionService
+		 */
+		QName qName = QName.createQName(typeQName, prefixResolver);
+		getVersionService().registerVersionLabelPolicy(qName, policy);
+	    
+	}
+	
+	public void setTypeQName(String typeQName) 
+	{
+		this.typeQName = typeQName;
+	}
+	
+	public String getTypeQName() 
+	{
+		return typeQName;
+	}
+	
+	public void setPolicy(CalculateVersionLabelPolicy policy)
+	{
+	    this.policy = policy;
+	}
+	
+	public CalculateVersionLabelPolicy getPolicy()
+	{
+	    return policy;
+	}
+
+    public void setNamespacePrefixResolver(NamespacePrefixResolver prefixResolver)
+    {
+        this.prefixResolver = prefixResolver;
+    }
+    public NamespacePrefixResolver getNamespacePrefixResolver()
+    {
+        return prefixResolver;
+    }
+
+    public void setVersionService(VersionService versionService)
+    {
+        this.versionService = versionService;
+    }
+
+    public VersionService getVersionService()
+    {
+        return versionService;
+    }
+	
+}

source/java/org/alfresco/repo/version/common/versionlabel/SerialVersionLabelPolicy.java

@@ -28,6 +28,7 @@ import java.io.Serializable;
 import java.util.Map;
 
 import org.alfresco.repo.version.VersionModel;
+import org.alfresco.repo.version.VersionServicePolicies.CalculateVersionLabelPolicy;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionType;
 import org.alfresco.service.namespace.QName;
@@ -38,7 +39,7 @@ import org.alfresco.util.VersionNumber;
  * 
  * @author Roy Wetherall
  */
-public class SerialVersionLabelPolicy 
+public class SerialVersionLabelPolicy implements CalculateVersionLabelPolicy
 {
     // TODO need to add support for branches into this labeling policy
     

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);
 }