From 0a8c0a6622f5285a3fd2d026e4cdd5faf32a3e4b Mon Sep 17 00:00:00 2001 From: Gethin James Date: Mon, 6 Feb 2012 17:57:14 +0000 Subject: [PATCH] Fixed failing test 8( getProperties needs to return the new Editions property git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/module/ModuleDetailsImpl.java | 5 +++++ .../java/org/alfresco/repo/module/ModuleDetailsImplTest.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java b/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java index f4a31cda1f..b016ca7672 100644 --- a/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java +++ b/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java @@ -32,6 +32,7 @@ import org.alfresco.service.cmr.module.ModuleInstallState; import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.alfresco.util.Pair; import org.alfresco.util.VersionNumber; +import org.apache.commons.lang.StringUtils; /** * Module details implementation. @@ -280,6 +281,10 @@ public class ModuleDetailsImpl implements ModuleDetails { properties.setProperty(PROP_REPO_VERSION_MAX, repoVersionMax.toString()); } + if (editions != null) + { + properties.setProperty(PROP_EDITIONS, StringUtils.join(editions,",")); + } if (dependencies.size() > 0) { for (ModuleDependency dependency : dependencies) diff --git a/source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java b/source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java index af663fdd71..35bf9493ee 100644 --- a/source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java +++ b/source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java @@ -47,7 +47,7 @@ public class ModuleDetailsImplTest extends TestCase defaultProperties.setProperty(ModuleDetails.PROP_TITLE, "Test"); defaultProperties.setProperty(ModuleDetails.PROP_DESCRIPTION, "Test description"); defaultProperties.setProperty(ModuleDetails.PROP_VERSION, "1.0.0"); - defaultProperties.setProperty(ModuleDetails.PROP_EDITIONS, "Community"); + defaultProperties.setProperty(ModuleDetails.PROP_EDITIONS, "Community, Enterprise"); defaultProperties.setProperty(ModuleDetails.PROP_REPO_VERSION_MIN, new VersionNumber("1.2").toString()); defaultProperties.setProperty(ModuleDetails.PROP_REPO_VERSION_MAX, new VersionNumber("1.4.3").toString()); defaultProperties.setProperty(ModuleDetails.PROP_DEPENDS_PREFIX + "a", "1.2.3");