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

Code cleanup

Browse Source
This commit is contained in:
prabathabey 2015-03-27 17:59:12 +05:30
parent 8ac5cb47a7
commit 1f587bddf8
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import org.wso2.carbon.device.mgt.core.DeviceManagementServiceProviderImpl;
import org.wso2.carbon.device.mgt.core.api.mgt.APIPublisherService;
import org.wso2.carbon.device.mgt.core.api.mgt.APIPublisherServiceImpl;
import org.wso2.carbon.device.mgt.core.api.mgt.APIRegistrationStartupObserver;
import org.wso2.carbon.device.mgt.core.app.mgt.AppManagementException;
import org.wso2.carbon.device.mgt.core.app.mgt.AppManagerImplHttp;
import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
@ -117,20 +118,10 @@ public class DeviceManagementServiceComponent {
new DeviceManagementServiceProviderImpl(this.getPluginRepository());
DeviceManagementDataHolder.getInstance().setDeviceManagementProvider(deviceManagementProvider);
LicenseConfigurationManager.getInstance().initConfig();
LicenseConfig licenseConfig =
LicenseConfigurationManager.getInstance().getLicenseConfig();
LicenseManager licenseManager = new LicenseManagerImpl();
DeviceManagementDataHolder.getInstance().setLicenseManager(licenseManager);
DeviceManagementDataHolder.getInstance().setLicenseConfig(licenseConfig);
AppManagementConfigurationManager.getInstance().initConfig();
AppManagementConfig appConfig =
AppManagementConfigurationManager.getInstance().getAppManagementConfig();
DeviceManagementDataHolder.getInstance().setAppManagerConfig(appConfig);
AppManagerImplHttp appManager = new AppManagerImplHttp(appConfig);
DeviceManagementDataHolder.getInstance().setAppManager(appManager);
/* Initializing license manager */
this.initLicenseManager();
/* Initializing app manager connector */
this.initAppManagerConnector();
OperationManagementDAOFactory.init(dsConfig);
@ -143,7 +134,7 @@ public class DeviceManagementServiceComponent {
"begin");
}
this.setupDeviceManagementSchema(dsConfig);
this.setupDefaultLicenses(licenseConfig);
this.setupDefaultLicenses(DeviceManagementDataHolder.getInstance().getLicenseConfig());
}
synchronized (LOCK) {
@ -164,6 +155,25 @@ public class DeviceManagementServiceComponent {
}
}
private void initLicenseManager() throws LicenseManagementException {
LicenseConfigurationManager.getInstance().initConfig();
LicenseConfig licenseConfig =
LicenseConfigurationManager.getInstance().getLicenseConfig();
LicenseManager licenseManager = new LicenseManagerImpl();
DeviceManagementDataHolder.getInstance().setLicenseManager(licenseManager);
DeviceManagementDataHolder.getInstance().setLicenseConfig(licenseConfig);
}
private void initAppManagerConnector() throws AppManagementException {
AppManagementConfigurationManager.getInstance().initConfig();
AppManagementConfig appConfig =
AppManagementConfigurationManager.getInstance().getAppManagementConfig();
DeviceManagementDataHolder.getInstance().setAppManagerConfig(appConfig);
AppManagerImplHttp appManager = new AppManagerImplHttp(appConfig);
DeviceManagementDataHolder.getInstance().setAppManager(appManager);
}
protected void deactivate(ComponentContext componentContext) {
//do nothing
}
@ -197,8 +207,7 @@ public class DeviceManagementServiceComponent {
initializer.createRegistryDatabase();
} catch (Exception e) {
throw new DeviceManagementException(
"Error occurred while initializing Device Management " +
"database schema", e);
"Error occurred while initializing Device Management database schema", e);
}
if (log.isDebugEnabled()) {
log.debug("Device management metadata repository schema has been successfully initialized");
@ -330,4 +339,5 @@ public class DeviceManagementServiceComponent {
protected void unsetDataSourceService(DataSourceService dataSourceService) {
//do nothing
}
}