From 717fa6dea8d78d7b41d5c05d9c2cdabdf8ab6aed Mon Sep 17 00:00:00 2001 From: prabathabey Date: Sun, 11 Jan 2015 23:58:12 +0530 Subject: [PATCH] Restructuring plugin config hierarchy --- .../mgt/mobile/config/MobileDeviceConfigurationManager.java | 5 +++-- product/modules/distribution/src/assembly/bin.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java index 551aa1dda..f5e074ec5 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/MobileDeviceConfigurationManager.java @@ -32,12 +32,13 @@ import java.io.File; public class MobileDeviceConfigurationManager { private static final String MOBILE_DEVICE_CONFIG_XML_NAME = "mobile-config.xml"; + private static final String MOBILE_DEVICE_PLUGIN_DIRECTORY = "mobile"; private MobileDeviceManagementConfig currentMobileDeviceConfig; private static MobileDeviceConfigurationManager mobileDeviceConfigManager; private final String mobileDeviceMgtConfigXMLPath = - CarbonUtils.getCarbonConfigDirPath() + File.separator + - MOBILE_DEVICE_CONFIG_XML_NAME; + CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + "device-mgt-plugin-configs" + File.separator + + MOBILE_DEVICE_PLUGIN_DIRECTORY + File.separator + MOBILE_DEVICE_CONFIG_XML_NAME; public static MobileDeviceConfigurationManager getInstance() { if (mobileDeviceConfigManager == null) { diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml index 24b93c5f0..ca621e202 100644 --- a/product/modules/distribution/src/assembly/bin.xml +++ b/product/modules/distribution/src/assembly/bin.xml @@ -369,7 +369,7 @@ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml - ${pom.artifactId}-${pom.version}/repository/conf + ${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-configs/mobile true 644