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

Merge branch 'feature/RM-6355_OrcaFix' into 'master'

Browse Source 
RM-6355 Orca: Won't start with 2.7 installed.

See merge request records-management/records-management!1092
This commit is contained in:
Rodica Sutu
2018-07-27 12:49:41 +01:00
parent f3cf9a2062 4211d4bd8a
commit dfa7cd8cd9
1 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java
View File

@@ -27,6 +27,8 @@
package org.alfresco.module.org_alfresco_module_rm.patch.compatibility; package org.alfresco.module.org_alfresco_module_rm.patch.compatibility;
import static org.alfresco.repo.module.ModuleVersionNumber.VERSION_ZERO;
import java.io.Serializable; import java.io.Serializable;
import org.alfresco.module.org_alfresco_module_rm.patch.ModulePatchExecuterImpl; import org.alfresco.module.org_alfresco_module_rm.patch.ModulePatchExecuterImpl;
@@ -117,15 +119,26 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent
@Override @Override
protected void executeInternal() protected void executeInternal()
{ {
ModuleVersionNumber moduleInstalledVersionNumber = getModuleVersionNumber(REGISTRY_PROPERTY_INSTALLED_VERSION); //Get the new module version
ModuleVersionNumber moduleCurrentVersionNumber = getModuleVersionNumber(REGISTRY_PROPERTY_CURRENT_VERSION); String moduleId = modulePatchExecuter.getModuleId();
ModuleVersionNumber moduleNewVersionNumber = moduleService.getModule(moduleId).getModuleVersionNumber();
// Get the module details from the registry
ModuleVersionNumber moduleCurrentVersionNumber = getModuleVersionNumber(REGISTRY_PROPERTY_CURRENT_VERSION,
moduleId);
// Get the module patch component name
String moduleName = getName(); String moduleName = getName();
if (moduleCurrentVersionNumber.equals(VERSION_ZERO) ||
if (isVersionLaterThan(moduleInstalledVersionNumber, moduleCurrentVersionNumber)) moduleCurrentVersionNumber.equals(moduleNewVersionNumber)) // No previous record of it
{
LOGGER.info("Module patch component '{}' is skipped, no previous version found.", moduleName);
}
else
{
if (isVersionLaterThan(moduleCurrentVersionNumber, moduleNewVersionNumber))
{ {
LOGGER.info("Module patch component '{}' is skipped for upgrade from version {} to version {}", LOGGER.info("Module patch component '{}' is skipped for upgrade from version {} to version {}",
moduleName, moduleInstalledVersionNumber, moduleCurrentVersionNumber); moduleName, moduleCurrentVersionNumber, moduleNewVersionNumber);
} }
else else
{ {
@@ -135,6 +148,7 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent
// execute path within an isolated transaction // execute path within an isolated transaction
retryingTransactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>() retryingTransactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
{ {
@Override @Override
public Void execute() public Void execute()
@@ -155,7 +169,8 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent
LOGGER.info(" ... completed module patch '{}'", moduleName); LOGGER.info(" ... completed module patch '{}'", moduleName);
} catch (Exception exception) }
catch (Exception exception)
{ {
// record the exception otherwise it gets swallowed // record the exception otherwise it gets swallowed
LOGGER.info(" ... error encountered. {}", exception.getMessage(), exception); LOGGER.info(" ... error encountered. {}", exception.getMessage(), exception);
@@ -163,13 +178,13 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent
} }
} }
} }
}
/** /**
* Helper method to get the ModuleVersionNumber. * Helper method to get the ModuleVersionNumber.
*/ */
private ModuleVersionNumber getModuleVersionNumber(String registryProperty) private ModuleVersionNumber getModuleVersionNumber(String registryProperty, String moduleId)
{ {
String moduleId = modulePatchExecuter.getModuleId();
RegistryKey moduleKeyVersion = new RegistryKey(ModuleComponentHelper.URI_MODULES_1_0, RegistryKey moduleKeyVersion = new RegistryKey(ModuleComponentHelper.URI_MODULES_1_0,
new String[]{REGISTRY_PATH_MODULES, moduleId, registryProperty}); new String[]{REGISTRY_PATH_MODULES, moduleId, registryProperty});
Serializable moduleVersion = this.registryService.getProperty(moduleKeyVersion); Serializable moduleVersion = this.registryService.getProperty(moduleKeyVersion);
@@ -182,22 +197,27 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent
* patches. * patches.
* *
*/ */
private boolean isVersionLaterThan(ModuleVersionNumber installedModuleVersionNumber, private boolean isVersionLaterThan(ModuleVersionNumber moduleCurrentVersionNumber,
ModuleVersionNumber currentModuleVersionNumber) ModuleVersionNumber moduleNewVersionNumber)
{ {
// assume that the v2.0 and v2.1 patches should be run // assume that the v2.0 and v2.1 patches should be run
boolean versionLaterThan = false; boolean versionLaterThan = false;
// if this is an upgrade as opposed to a fresh install // if this is an upgrade as opposed to a fresh install
if (installedModuleVersionNumber.compareTo(currentModuleVersionNumber) != 0) if (moduleCurrentVersionNumber.compareTo(moduleNewVersionNumber) < 0)
{ {
// if the installed version is later than the minimum version number of this patch // if the installed version is later than the minimum version number of this patch
ModuleVersionNumber minVersion = this.getAppliesFromVersionNumber(); ModuleVersionNumber minVersion = this.getAppliesFromVersionNumber();
if (installedModuleVersionNumber.compareTo(minVersion) >= 0) if (moduleCurrentVersionNumber.compareTo(minVersion) >= 0)
{ {
versionLaterThan = true; versionLaterThan = true;
} }
} }
// v2.0 and v2.1 patches should not be run when both the current and the new version numbers are equals
else
{
versionLaterThan =true;
}
return versionLaterThan; return versionLaterThan;
} }