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

Removing WSO2 prefix out of all CDM specific data source configurations and assigning more meaningful names

Browse Source
This commit is contained in:
prabathabey 2015-01-11 23:42:42 +05:30
parent d999279520
commit d50f043a55
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml
View File

@ -19,7 +19,7 @@
<ManagementRepository>
<DataSourceConfiguration>
<JndiLookupDefinition>
<Name>jdbc/WSO2MOBILE_DB</Name>
<Name>jdbc/MOBILE_MGT_DS</Name>
</JndiLookupDefinition>
</DataSourceConfiguration>
</ManagementRepository>

2
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
View File

@ -18,7 +18,7 @@
<ManagementRepository>
<DataSourceConfiguration>
<JndiLookupDefinition>
<Name>jdbc/WSO2DEVICE_DB</Name>
<Name>jdbc/DEVICE_MGT_DS</Name>
</JndiLookupDefinition>
</DataSourceConfiguration>
</ManagementRepository>

30
product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
View File

@ -5,14 +5,14 @@
<datasources>
<datasource>
<name>WSO2DEVICE_DB</name>
<name>DEVICE_MGT_DS</name>
<description>The datasource used for CDM</description>
<jndiConfig>
<name>jdbc/WSO2DEVICE_DB</name>
<name>jdbc/DEVICE_MGT_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2DEVICE_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<url>jdbc:h2:repository/database/WSO2DEVICEMGT_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
@ -25,10 +25,10 @@
</definition>
</datasource>
<datasource>
<name>WSO2MOBILE_DB</name>
<name>MOBILE_MGT_DS</name>
<description>The datasource used for CDM Mobile Device Management</description>
<jndiConfig>
<name>jdbc/WSO2MOBILE_DB</name>
<name>jdbc/MOBILE_MGT_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
@ -44,5 +44,25 @@
</configuration>
</definition>
</datasource>
<datasource>
<name>WSO2DEVICE_DB</name>
<description>The datasource used for CDM</description>
<jndiConfig>
<name>jdbc/WSO2AM_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
</datasources>
</datasources-configuration>