|#000| renamed openlmisDataSource properties

OpenLMIS · May 24, 2013 · 0bd5fd3 · 0bd5fd3
1 parent e91a5f7
commit 0bd5fd3
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 25 deletions.
diff --git a/gradle-perf.properties b/gradle-perf.properties
@@ -1,3 +1,5 @@
 databaseHostName=54.251.214.21
 dbName=open_lmis
-atomfeedDbSchema=atomfeed
+atomfeedDbSchema=atomfeed
+dburl=jdbc:postgresql://54.251.214.21:5432/open_lmis
+httpport=9091
diff --git a/modules/db/src/main/resources/applicationContext-db.xml b/modules/db/src/main/resources/applicationContext-db.xml
@@ -32,8 +32,8 @@
         <property name="jdbcUrl" value="${openlmis.jdbc.url}"/>
         <property name="user" value="${openlmis.jdbc.username}"/>
         <property name="password" value="${openlmis.jdbc.password}"/>
-        <property name="maxPoolSize" value="${conn.pool.maxPoolSize}"/>
-        <property name="initialPoolSize" value="${conn.pool.initialPoolSize}"/>
+        <property name="maxPoolSize" value="${openlmis.conn.pool.maxPoolSize}"/>
+        <property name="initialPoolSize" value="${openlmis.conn.pool.initialPoolSize}"/>
     </bean>
 
     <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">

diff --git a/modules/db/src/test/resources/config/ci/postgresql.properties b/modules/db/src/test/resources/config/ci/postgresql.properties
@@ -8,5 +8,5 @@ jdbc.driverClassName=org.postgresql.Driver
 openlmis.jdbc.url=jdbc:postgresql:open_lmis_st
 openlmis.jdbc.username=postgres
 openlmis.jdbc.password=p@ssw0rd
-conn.pool.maxPoolSize = 25
-conn.pool.initialPoolSize = 5
+openlmis.conn.pool.maxPoolSize = 25
+openlmis.conn.pool.initialPoolSize = 5
diff --git a/modules/db/src/test/resources/config/local/postgresql.properties b/modules/db/src/test/resources/config/local/postgresql.properties
@@ -8,5 +8,5 @@ jdbc.driverClassName=org.postgresql.Driver
 openlmis.jdbc.url=jdbc:postgresql:open_lmis
 openlmis.jdbc.username=postgres
 openlmis.jdbc.password=p@ssw0rd
-conn.pool.maxPoolSize = 25
-conn.pool.initialPoolSize = 5
+openlmis.conn.pool.maxPoolSize = 25
+openlmis.conn.pool.initialPoolSize = 5
diff --git a/modules/openlmis-web/src/main/resources/default.properties b/modules/openlmis-web/src/main/resources/default.properties
@@ -39,16 +39,16 @@ atomdb.c3p0.max_statements=20
 atomdb.c3p0.idle_test_period=300
 atomdb.c3p0.acquire_increment=3
 
-jdbc.replication.driverClassName=org.postgresql.Driver
-jdbc.replication.url=jdbc:postgresql:open_lmis
-jdbc.replication.username=postgres
-jdbc.replication.password=p@ssw0rd
-conn.replication.pool.maxPoolSize = 25
-conn.replication.pool.initialPoolSize = 5
+openlmis.replication.jdbc.driverClassName=org.postgresql.Driver
+openlmis.replication.jdbc.url=jdbc:postgresql:open_lmis
+openlmis.replication.jdbc.username=postgres
+openlmis.replication.jdbc.password=p@ssw0rd
+openlmis.replication.conn.pool.maxPoolSize = 25
+openlmis.replication.conn.pool.initialPoolSize = 5
 
 jdbc.driverClassName=org.postgresql.Driver
 openlmis.jdbc.url=jdbc:postgresql:open_lmis
 openlmis.jdbc.username=postgres
 openlmis.jdbc.password=p@ssw0rd
-conn.pool.maxPoolSize = 25
-conn.pool.initialPoolSize = 5
+openlmis.conn.pool.maxPoolSize = 25
+openlmis.conn.pool.initialPoolSize = 5
diff --git a/modules/openlmis-web/src/main/resources/perf/app.properties b/modules/openlmis-web/src/main/resources/perf/app.properties
@@ -4,7 +4,7 @@
 # If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-jdbc.replication.url=jdbc:postgresql://10.131.43.48/open_lmis
+openlmis.replication.jdbc.url=jdbc:postgresql://10.131.43.48/open_lmis
 jdbc.url=jdbc:postgresql://10.142.170.199/open_lmis
 openlmis.jdbc.url=jdbc:postgresql://10.142.170.199/open_lmis
-conn.pool.maxPoolSize = 100
+openlmis.conn.pool.maxPoolSize = 100
diff --git a/modules/openlmis-web/src/main/resources/perf2/app.properties b/modules/openlmis-web/src/main/resources/perf2/app.properties
@@ -4,7 +4,7 @@
 # If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-jdbc.replication.url=jdbc:postgresql://10.148.67.61/open_lmis
+openlmis.replication.jdbc.url=jdbc:postgresql://10.148.67.61/open_lmis
 jdbc.url=jdbc:postgresql://10.131.13.94/open_lmis
 openlmis.jdbc.url=jdbc:postgresql://10.131.13.94/open_lmis
-conn.pool.maxPoolSize = 100
+openlmis.conn.pool.maxPoolSize = 100
diff --git a/modules/reporting/src/main/resources/applicationContext-reporting-db.xml b/modules/reporting/src/main/resources/applicationContext-reporting-db.xml
@@ -30,12 +30,12 @@
 
 
     <bean id="replicationDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
-        <property name="driverClass" value="${jdbc.replication.driverClassName}"/>
-        <property name="jdbcUrl" value="${jdbc.replication.url}"/>
-        <property name="user" value="${jdbc.replication.username}"/>
-        <property name="password" value="${jdbc.replication.password}"/>
-        <property name="maxPoolSize" value="${conn.replication.pool.maxPoolSize}"/>
-        <property name="initialPoolSize" value="${conn.replication.pool.initialPoolSize}"/>
+        <property name="driverClass" value="${openlmis.replication.jdbc.driverClassName}"/>
+        <property name="jdbcUrl" value="${openlmis.replication.jdbc.url}"/>
+        <property name="user" value="${openlmis.replication.jdbc.username}"/>
+        <property name="password" value="${openlmis.replication.jdbc.password}"/>
+        <property name="maxPoolSize" value="${openlmis.replication.conn.pool.maxPoolSize}"/>
+        <property name="initialPoolSize" value="${openlmis.replication.conn.pool.initialPoolSize}"/>
     </bean>