dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2778
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-01-28 22:44:54 +0100
message:
  Removed c3p0 configuration file and put connection pool config directly on datasource bean definition. Bumping max pool size, maxIdleTime and acquireIncrement values.
removed:
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/c3p0-config.xml
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2011-01-13 15:44:09 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2011-01-28 21:44:54 +0000
@@ -563,8 +563,7 @@
                         columnIndex++;
                     }
 
-                    // Regression not relevant for organisation unit
-                    // category
+                    // Regression not relevant for organisation unit category
                 }
 
             }

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2010-11-23 16:12:57 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2011-01-28 21:44:54 +0000
@@ -57,7 +57,10 @@
     <property name="jdbcUrl" ref="url"/>
     <property name="user" ref="username"/>
     <property name="password" ref="password"/>
-  </bean>  
+    <property name="acquireIncrement" value="6"/>
+    <property name="maxPoolSize" value="40"/>
+    <property name="maxIdleTime" value="7200"/>
+  </bean>
   
   <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
     <property name="dataSource" ref="dataSource"/>

=== removed file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/c3p0-config.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/c3p0-config.xml	2010-07-10 16:26:48 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/c3p0-config.xml	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<c3p0-config>
-    <default-config>
-        <property name="initialPoolSize">1</property>
-        <property name="maxIdleTime">60</property>
-        <property name="maxPoolSize">20</property>
-        <property name="minPoolSize">1</property>
-    </default-config>
- </c3p0-config>