community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

License Managment refactor

Browse Source
This commit is contained in:
manoj 2015-02-07 06:14:20 +05:30
parent ce1586a52c
commit 4b81d04320
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
View File

@ -59,21 +59,11 @@ public final class DeviceManagementConstants {
public final static String LANGUAGE_CODE_ENGLISH_UK = "en-uk"; public final static String LANGUAGE_CODE_ENGLISH_UK = "en-uk";
} }
public static final class DefaultLicences {
private DefaultLicences() {
throw new AssertionError();
}
public static final String DEFAULT_LICENSE_CONFIG_XML_NAME = "DefaultLicense.xml";
}
public static final class LicenseProperties { public static final class LicenseProperties {
private LicenseProperties() { private LicenseProperties() {
throw new AssertionError(); throw new AssertionError();
} }
public static final String OVERVIEW_PROVIDER = "overview_provider"; public static final String OVERVIEW_PROVIDER = "overview_provider";
public static final String OVERVIEW_NAME = "overview_name"; public static final String OVERVIEW_NAME = "overview_name";
public static final String OVERVIEW_LANGUAGE = "overview_language"; public static final String OVERVIEW_LANGUAGE = "overview_language";

3
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java
View File

@ -68,7 +68,8 @@ public class LicenseManagerImpl implements LicenseManager {
try { try {
GovernanceUtils.loadGovernanceArtifacts((UserRegistry) registry); GovernanceUtils.loadGovernanceArtifacts((UserRegistry) registry);
GenericArtifactManager artifactManager = new GenericArtifactManager(registry, "license"); GenericArtifactManager artifactManager = new GenericArtifactManager(registry,
DeviceManagementConstants.LicenseProperties.LICENSE_REGISTRY_KEY);
filteredArtifacts = artifactManager.findGenericArtifacts( filteredArtifacts = artifactManager.findGenericArtifacts(
new GenericArtifactFilter() { new GenericArtifactFilter() {

3
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java
View File

@ -68,7 +68,7 @@ public class LicenseManagementServiceComponent {
LicenseManager licenseManager = new LicenseManagerImpl(); LicenseManager licenseManager = new LicenseManagerImpl();
LicenseManagementDataHolder.getInstance().setLicenseManager(licenseManager); LicenseManagementDataHolder.getInstance().setLicenseManager(licenseManager);
/* If -Dsetup option enabled then create creates default license management */ /* If -Dsetup option enabled then create creates default license management */
String setupOption = System.getProperty( String setupOption = System.getProperty(
org.wso2.carbon.device.mgt.core.DeviceManagementConstants.Common.PROPERTY_SETUP); org.wso2.carbon.device.mgt.core.DeviceManagementConstants.Common.PROPERTY_SETUP);
@ -81,7 +81,6 @@ public class LicenseManagementServiceComponent {
.getLicenseMgtConfig(); .getLicenseMgtConfig();
addDefaultLicenses(licenseManagementConfig); addDefaultLicenses(licenseManagementConfig);
} }
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Registering OSGi service LicenseManagementService"); log.debug("Registering OSGi service LicenseManagementService");
} }