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
This commit is contained in:
Mark Rogers
2010-01-21 14:41:20 +00:00
parent 08329caf4b
commit be551544aa
5 changed files with 1435 additions and 1279 deletions

View File

@@ -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