inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failing test 8(

Browse Source 
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
This commit is contained in:
Gethin James
2012-02-06 17:57:14 +00:00
parent f530502bd3
commit 0a8c0a6622
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/module/ModuleDetailsImpl.java
View File

@@ -32,6 +32,7 @@ import org.alfresco.service.cmr.module.ModuleInstallState;
import org.springframework.extensions.surf.util.ISO8601DateFormat; import org.springframework.extensions.surf.util.ISO8601DateFormat;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.alfresco.util.VersionNumber; import org.alfresco.util.VersionNumber;
import org.apache.commons.lang.StringUtils;
/** /**
* Module details implementation. * Module details implementation.
@@ -280,6 +281,10 @@ public class ModuleDetailsImpl implements ModuleDetails
{ {
properties.setProperty(PROP_REPO_VERSION_MAX, repoVersionMax.toString()); properties.setProperty(PROP_REPO_VERSION_MAX, repoVersionMax.toString());
} }
if (editions != null)
{
properties.setProperty(PROP_EDITIONS, StringUtils.join(editions,","));
}
if (dependencies.size() > 0) if (dependencies.size() > 0)
{ {
for (ModuleDependency dependency : dependencies) for (ModuleDependency dependency : dependencies)

2
source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java
View File

@@ -47,7 +47,7 @@ public class ModuleDetailsImplTest extends TestCase
defaultProperties.setProperty(ModuleDetails.PROP_TITLE, "Test"); defaultProperties.setProperty(ModuleDetails.PROP_TITLE, "Test");
defaultProperties.setProperty(ModuleDetails.PROP_DESCRIPTION, "Test description"); defaultProperties.setProperty(ModuleDetails.PROP_DESCRIPTION, "Test description");
defaultProperties.setProperty(ModuleDetails.PROP_VERSION, "1.0.0"); 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_MIN, new VersionNumber("1.2").toString());
defaultProperties.setProperty(ModuleDetails.PROP_REPO_VERSION_MAX, new VersionNumber("1.4.3").toString()); defaultProperties.setProperty(ModuleDetails.PROP_REPO_VERSION_MAX, new VersionNumber("1.4.3").toString());
defaultProperties.setProperty(ModuleDetails.PROP_DEPENDS_PREFIX + "a", "1.2.3"); defaultProperties.setProperty(ModuleDetails.PROP_DEPENDS_PREFIX + "a", "1.2.3");