From d50f043a557990c232a9f272c3317436108b9e1c Mon Sep 17 00:00:00 2001 From: prabathabey Date: Sun, 11 Jan 2015 23:42:42 +0530 Subject: [PATCH] Removing WSO2 prefix out of all CDM specific data source configurations and assigning more meaningful names --- .../src/main/resources/conf/mobile-config.xml | 2 +- .../src/main/resources/conf/cdm-config.xml | 2 +- .../conf/datasources/cdm-datasources.xml | 30 +++++++++++++++---- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml index 7a3963fbd..73ca22243 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml @@ -19,7 +19,7 @@ - jdbc/WSO2MOBILE_DB + jdbc/MOBILE_MGT_DS diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml index 1f7bca1d9..87176d638 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml @@ -18,7 +18,7 @@ - jdbc/WSO2DEVICE_DB + jdbc/DEVICE_MGT_DS diff --git a/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml b/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml index 7b02df9cd..0797b85da 100755 --- a/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml +++ b/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml @@ -5,14 +5,14 @@ - WSO2DEVICE_DB + DEVICE_MGT_DS The datasource used for CDM - jdbc/WSO2DEVICE_DB + jdbc/DEVICE_MGT_DS - jdbc:h2:repository/database/WSO2DEVICE_DB;DB_CLOSE_ON_EXIT=FALSE + jdbc:h2:repository/database/WSO2DEVICEMGT_DB;DB_CLOSE_ON_EXIT=FALSE wso2carbon wso2carbon org.h2.Driver @@ -25,10 +25,10 @@ - WSO2MOBILE_DB + MOBILE_MGT_DS The datasource used for CDM Mobile Device Management - jdbc/WSO2MOBILE_DB + jdbc/MOBILE_MGT_DS @@ -44,5 +44,25 @@ + + WSO2DEVICE_DB + The datasource used for CDM + + jdbc/WSO2AM_DB + + + + jdbc:h2:repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE + wso2carbon + wso2carbon + org.h2.Driver + 50 + 60000 + true + SELECT 1 + 30000 + + +