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

ACE-3092

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-10-13 13:05:48 +00:00
parent a98be4b880
commit fb244f2e46
4 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -529,7 +529,7 @@ public class ModuleComponentHelper
private void startModule(ModuleDetails module, Set<String> startedModules, Set<ModuleComponent> executedComponents) private void startModule(ModuleDetails module, Set<String> startedModules, Set<ModuleComponent> executedComponents)
{ {
String moduleId = module.getId(); String moduleId = module.getId();
ModuleVersionNumber moduleNewVersion = module.getVersion(); ModuleVersionNumber moduleNewVersion = module.getModuleVersionNumber();
// Double check whether we have done this module already // Double check whether we have done this module already
if (startedModules.contains(moduleId)) if (startedModules.contains(moduleId))

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

@@ -360,7 +360,7 @@ public class ModuleDetailsImpl implements ModuleDetails
return aliases; return aliases;
} }
public ModuleVersionNumber getVersion() public ModuleVersionNumber getModuleVersionNumber()
{ {
return version; return version;
} }
@@ -609,7 +609,7 @@ public class ModuleDetailsImpl implements ModuleDetails
return false; return false;
} }
// Check the version number // Check the version number
ModuleVersionNumber checkVersion = moduleDetails.getVersion(); ModuleVersionNumber checkVersion = moduleDetails.getModuleVersionNumber();
boolean matched = false; boolean matched = false;
for (Pair<ModuleVersionNumber, ModuleVersionNumber> versionRange : versionRanges) for (Pair<ModuleVersionNumber, ModuleVersionNumber> versionRange : versionRanges)
{ {
@@ -632,4 +632,22 @@ public class ModuleDetailsImpl implements ModuleDetails
return matched; return matched;
} }
} }
@Override
public VersionNumber getVersion()
{
// lossy translation between maven version and old VersionNumber
String mavenVersion = version.toString();
StringBuffer b = new StringBuffer();
for(int i = 0; i < mavenVersion.length(); i++)
{
char c = mavenVersion.charAt(i);
if(Character.isDigit(c) || c == '.')
{
b.append(c);
}
}
return new VersionNumber(b.toString());
}
} }

6
source/java/org/alfresco/repo/module/tool/ModuleManagementTool.java
View File

@@ -231,7 +231,7 @@ public class ModuleManagementTool implements LogOutput
throw new ModuleManagementToolException("No module.properties file has been found in the installing .amp file '" + ampFileLocation + "'"); throw new ModuleManagementToolException("No module.properties file has been found in the installing .amp file '" + ampFileLocation + "'");
} }
String installingId = installingModuleDetails.getId(); String installingId = installingModuleDetails.getId();
ModuleVersionNumber installingVersion = installingModuleDetails.getVersion(); ModuleVersionNumber installingVersion = installingModuleDetails.getModuleVersionNumber();
//A series of checks //A series of checks
warHelper.checkCompatibleVersion(warFile, installingModuleDetails); warHelper.checkCompatibleVersion(warFile, installingModuleDetails);
@@ -303,7 +303,7 @@ public class ModuleManagementTool implements LogOutput
if (installedModuleDetails != null) if (installedModuleDetails != null)
{ {
String installedId = installedModuleDetails.getId(); String installedId = installedModuleDetails.getId();
ModuleVersionNumber installedVersion = installedModuleDetails.getVersion(); ModuleVersionNumber installedVersion = installedModuleDetails.getModuleVersionNumber();
int compareValue = installedVersion.compareTo(installingVersion); int compareValue = installedVersion.compareTo(installingVersion);
if (compareValue > 0) if (compareValue > 0)
@@ -711,7 +711,7 @@ public class ModuleManagementTool implements LogOutput
} }
outputVerboseMessage("Module '" + moduleDetails.getId() + "' installed in '" + warLocation + "'"); outputVerboseMessage("Module '" + moduleDetails.getId() + "' installed in '" + warLocation + "'");
outputVerboseMessage(" Title: " + moduleDetails.getTitle(), true); outputVerboseMessage(" Title: " + moduleDetails.getTitle(), true);
outputVerboseMessage(" Version: " + moduleDetails.getVersion(), true); outputVerboseMessage(" Version: " + moduleDetails.getModuleVersionNumber(), true);
outputVerboseMessage(" Install Date: " + moduleDetails.getInstallDate(), true); outputVerboseMessage(" Install Date: " + moduleDetails.getInstallDate(), true);
outputVerboseMessage(" Description: " + moduleDetails.getDescription(), true); outputVerboseMessage(" Description: " + moduleDetails.getDescription(), true);
} }

14
source/java/org/alfresco/service/cmr/module/ModuleDetails.java
View File

@@ -74,7 +74,15 @@ public interface ModuleDetails extends Serializable
* *
* @return module version number * @return module version number
*/ */
ModuleVersionNumber getVersion(); ModuleVersionNumber getModuleVersionNumber();
/**
* Get the version number of the module
*
* @return module version number
* @deprecated use getModuleVersionNumber which knows about maven style version numbers
*/
VersionNumber getVersion();
/** /**
* Get the title of the module * Get the title of the module
@@ -143,6 +151,10 @@ public interface ModuleDetails extends Serializable
*/ */
void setInstallState(ModuleInstallState installState); void setInstallState(ModuleInstallState installState);
/**
*
* @return the editions
*/
List<String> getEditions(); List<String> getEditions();
/** /**