cleaning datasources

application-manager-new
ayyoob 9 years ago
parent 2e85e030c4
commit 0a2860d0d4

@ -244,7 +244,6 @@
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/master-datasources.xml</include> <include>**/master-datasources.xml</include>
<include>**/cdm-datasources.xml</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>

@ -20,7 +20,6 @@
<providers> <providers>
<provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider> <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
</providers> </providers>
<datasources> <datasources>
<datasource> <datasource>
<name>DM_DS</name> <name>DM_DS</name>
@ -42,90 +41,5 @@
</configuration> </configuration>
</definition> </definition>
</datasource> </datasource>
<!-- *****Replace ${BAM_HOME} in `url` element with your WSO2 BAM home directory.***** -->
<datasource>
<name>WSO2DM_STATS_DB</name>
<jndiConfig>
<name>jdbc/WSO2DM_STATS_DB</name>
</jndiConfig>
<description>The datasource used for analyzer data</description>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:$/repository/database/WSO2DM_STATS_DB;AUTO_SERVER=TRUE</url>
<!--url>jdbc:h2:${BAM_HOME}/repository/database/WSO2DM_STATS_DB;AUTO_SERVER=TRUE</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>
<datasource>
<name>MobileIOSDM_DS</name>
<description>The datasource used for CDM Mobile Device Management</description>
<jndiConfig>
<name>jdbc/MobileIOSDM_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2MobileIOS_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>
<datasource>
<name>MobileAndroidDM_DS</name>
<description>The datasource used for CDM Mobile Device Management</description>
<jndiConfig>
<name>jdbc/MobileAndroidDM_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2MobileAndroid_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>
<datasource>
<name>MobileWindowsDM_DS</name>
<description>The datasource used for CDM Mobile Device Management</description>
<jndiConfig>
<name>jdbc/MobileWindowsDM_DS</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2MobileWindows_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>

@ -63,28 +63,6 @@
</configuration> </configuration>
</definition> </definition>
</datasource> </datasource>
<datasource>
<name>WSO2_SOCIAL_DB</name>
<description>The datasource used for Store social database</description>
<jndiConfig>
<name>jdbc/WSO2_SOCIAL_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2_SOCIAL_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>
<datasource> <datasource>
<name>WSO2_MB_STORE_DB</name> <name>WSO2_MB_STORE_DB</name>
<description>The datasource used for message broker database</description> <description>The datasource used for message broker database</description>
@ -106,21 +84,23 @@
</configuration> </configuration>
</definition> </definition>
</datasource> </datasource>
<datasource> <datasource>
<name>JAGH2</name> <name>DM_DS</name>
<description>The datasource used for by the Jaggery Storage Manager</description> <description>The datasource used for CDM</description>
<jndiConfig> <jndiConfig>
<name>jdbc/ES_Storage</name> <name>jdbc/DM_DS</name>
</jndiConfig> </jndiConfig>
<definition type="RDBMS"> <definition type="RDBMS">
<configuration> <configuration>
<url>jdbc:h2:repository/database/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url> <url>jdbc:h2:repository/database/WSO2DM_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>
<maxActive>50</maxActive> <maxActive>50</maxActive>
<maxWait>60000</maxWait> <maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration> </configuration>
</definition> </definition>
</datasource> </datasource>

Loading…
Cancel
Save