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

Fixed issues with detecting correct license

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java
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.admin.RepoUsage.LicenseMode;
import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.cmr.module.ModuleService;
import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.service.license.LicenseDescriptor;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
@@ -73,11 +74,18 @@ public class ModuleCompatibilityComponent implements ApplicationListener<Context
@Override @Override
public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent)
{ {
// license mode
LicenseMode licenseMode = LicenseMode.UNKNOWN;
// grab the application context // grab the application context
ApplicationContext applicationContext = contextRefreshedEvent.getApplicationContext(); ApplicationContext applicationContext = contextRefreshedEvent.getApplicationContext();
// get the license mode // 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 // determine whether RM Enterprise is installed or not
boolean isRMEnterprise = isRMEnterprise(); boolean isRMEnterprise = isRMEnterprise();

6
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponentUnitTest.java
View File

@@ -26,8 +26,8 @@ import static org.mockito.Mockito.when;
import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode; import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode;
import org.alfresco.service.cmr.module.ModuleDetails; import org.alfresco.service.cmr.module.ModuleDetails;
import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.cmr.module.ModuleService;
import org.alfresco.service.descriptor.Descriptor;
import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.service.license.LicenseDescriptor;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
@@ -50,7 +50,7 @@ public class ModuleCompatibilityComponentUnitTest
@Mock private ContextRefreshedEvent mockedContextRefreshedEvent; @Mock private ContextRefreshedEvent mockedContextRefreshedEvent;
@Mock private ConfigurableApplicationContext mockedApplicationContext; @Mock private ConfigurableApplicationContext mockedApplicationContext;
@Mock private ModuleDetails mockedModuleDetails; @Mock private ModuleDetails mockedModuleDetails;
@Mock private Descriptor mockedDescriptor; @Mock private LicenseDescriptor mockedDescriptor;
/** object under test */ /** object under test */
@InjectMocks private ModuleCompatibilityComponent moduleCompatibilityComponent; @InjectMocks private ModuleCompatibilityComponent moduleCompatibilityComponent;
@@ -65,7 +65,7 @@ public class ModuleCompatibilityComponentUnitTest
when(mockedContextRefreshedEvent.getApplicationContext()) when(mockedContextRefreshedEvent.getApplicationContext())
.thenReturn(mockedApplicationContext); .thenReturn(mockedApplicationContext);
when(mockedDescriptorService.getServerDescriptor()) when(mockedDescriptorService.getLicenseDescriptor())
.thenReturn(mockedDescriptor); .thenReturn(mockedDescriptor);
} }