Fixed issues with detecting correct license

This commit is contained in:
Roy Wetherall
2016-02-29 13:52:17 +11:00
parent 0f80b9f992
commit e5e5597efc
2 changed files with 13 additions and 5 deletions

View File

@@ -21,6 +21,7 @@ package org.alfresco.module.org_alfresco_module_rm.bootstrap;
import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode;
import org.alfresco.service.cmr.module.ModuleService;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.service.license.LicenseDescriptor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
@@ -73,11 +74,18 @@ public class ModuleCompatibilityComponent implements ApplicationListener<Context
@Override
public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent)
{
// license mode
LicenseMode licenseMode = LicenseMode.UNKNOWN;
// grab the application context
ApplicationContext applicationContext = contextRefreshedEvent.getApplicationContext();
// get the license mode
LicenseMode licenseMode = descriptorService.getServerDescriptor().getLicenseMode();
LicenseDescriptor license = descriptorService.getLicenseDescriptor();
if (license != null)
{
licenseMode = license.getLicenseMode();
}
// determine whether RM Enterprise is installed or not
boolean isRMEnterprise = isRMEnterprise();