From ee030e136df39bd7e2f9fe3187fd03e9d218aa03 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Mon, 8 Dec 2014 20:47:23 +0530 Subject: [PATCH] Renaming deviceMgt-config.xml as cdm-config.xml --- .../device/mgt/common/DeviceManagementConstants.java | 8 ++++---- .../conf/{deviceMgt-config.xml => cdm-config.xml} | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) rename features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/{deviceMgt-config.xml => cdm-config.xml} (93%) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java index a23886dff..ee5024a94 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java @@ -24,18 +24,18 @@ public final class DeviceManagementConstants { /*Data Source Configurations */ public static final class DataSourceProperties { - + private DataSourceProperties() { + throw new AssertionError(); + } public static final String DB_CHECK_QUERY = "SELECT * FROM DM_DEVICE"; public static final String SECURE_VAULT_NS = "http://org.wso2.securevault/configuration"; - public static final String DEVICE_CONFIG_XML_NAME = "device-config.xml"; + public static final String DEVICE_CONFIG_XML_NAME = "cdm-config.xml"; } public static final class SecureValueProperties { - private SecureValueProperties() { throw new AssertionError(); } - public static final String SECRET_ALIAS_ATTRIBUTE_NAME_WITH_NAMESPACE = "secretAlias"; public static final String SECURE_VAULT_NS = "http://org.wso2.securevault/configuration"; } diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/deviceMgt-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml similarity index 93% rename from features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/deviceMgt-config.xml rename to features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml index 7cb6db7a2..381ad434a 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/deviceMgt-config.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml @@ -15,7 +15,6 @@ --> - @@ -23,7 +22,5 @@ - -