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

Removed superseded changes brought in by the merge.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2012-02-08 16:05:05 +00:00
parent 503b462749
commit 1e8c35affa
3 changed files with 1 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,6 @@ public class ModuleManagementTool
/** Standard directories found in the alfresco war */
public static final String BACKUP_DIR = WarHelper.MODULE_NAMESPACE_DIR+ "/backup";
public static final String VERSION_PROPERTIES = "/WEB-INF/classes/alfresco/version.properties";
/** Operations and options supperted via the command line interface to this class */
private static final String OP_INSTALL = "install";
@@ -232,9 +231,6 @@ public class ModuleManagementTool
}
String installingId = installingModuleDetails.getId();
VersionNumber installingVersion = installingModuleDetails.getVersion();
//Check that the target war repo is the correct version
checkTargetWarVersion(warFileLocation, installingModuleDetails);
//A series of checks
warHelper.checkCompatibleVersion(theWar, installingModuleDetails);
@@ -376,20 +372,6 @@ public class ModuleManagementTool
}
}
protected void checkTargetWarVersion(String warFileLocation, ModuleDetails installingModuleDetails)
{
Properties warVers = ModuleDetailsHelper.getPropertiesFromWar(warFileLocation, VERSION_PROPERTIES);
outputMessage("WAR properties '" + warVers + "'");
VersionNumber warVersion = new VersionNumber(warVers.getProperty("version.major")+"."+warVers.getProperty("version.revision")+"."+warVers.getProperty("version.minor"));
if(warVersion.compareTo(installingModuleDetails.getRepoVersionMin())==-1) {
throw new ModuleManagementToolException("The module ("+installingModuleDetails.getTitle()+") must be installed on a repo version greater than "+installingModuleDetails.getRepoVersionMin());
}
if(warVersion.compareTo(installingModuleDetails.getRepoVersionMax())==1) {
throw new ModuleManagementToolException("The module ("+installingModuleDetails.getTitle()+") cannot be installed on a repo version greater than "+installingModuleDetails.getRepoVersionMax());
}
}
private void backupWar(String warFileLocation, boolean backupWAR)
{