nipuni
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
revert-70aa11f8
prabathabey 10 years ago
parent d999279520
commit d50f043a55
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

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

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

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

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

@ -5,14 +5,14 @@
<datasources> <datasources>
<datasource> <datasource>
<name>WSO2DEVICE_DB</name> <name>DEVICE_MGT_DS</name>
<description>The datasource used for CDM</description> <description>The datasource used for CDM</description>
<jndiConfig> <jndiConfig>
<name>jdbc/WSO2DEVICE_DB</name> <name>jdbc/DEVICE_MGT_DS</name>
</jndiConfig> </jndiConfig>
<definition type="RDBMS"> <definition type="RDBMS">
<configuration> <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> <username>wso2carbon</username>
<password>wso2carbon</password> <password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName> <driverClassName>org.h2.Driver</driverClassName>
@ -25,10 +25,10 @@
</definition> </definition>
</datasource> </datasource>
<datasource> <datasource>
<name>WSO2MOBILE_DB</name> <name>MOBILE_MGT_DS</name>
<description>The datasource used for CDM Mobile Device Management</description> <description>The datasource used for CDM Mobile Device Management</description>
<jndiConfig> <jndiConfig>
<name>jdbc/WSO2MOBILE_DB</name> <name>jdbc/MOBILE_MGT_DS</name>
</jndiConfig> </jndiConfig>
<definition type="RDBMS"> <definition type="RDBMS">
<configuration> <configuration>
@ -44,5 +44,25 @@
</configuration> </configuration>
</definition> </definition>
</datasource> </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>
</datasources-configuration> </datasources-configuration>

Write Preview
Loading…
Cancel
Save