dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3861
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-06-09 22:24:19 +0200
message:
  Added missing ehcache definition.
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/DefaultSchedulingManager.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/Scheduler.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js


--
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/scheduling/DefaultSchedulingManager.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/DefaultSchedulingManager.java	2011-06-07 10:35:56 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/DefaultSchedulingManager.java	2011-06-09 20:24:19 +0000
@@ -74,7 +74,7 @@
 
     public void scheduleTasks()
     {
-        scheduler.scheduleTask( getRunnables(), CRON_NIGHTLY_1AM );
+        scheduler.scheduleTask( getRunnables(), CRON_NIGHTLY_0AM );
     }
     
     public void stopTasks()

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2011-05-29 11:00:17 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2011-06-09 20:24:19 +0000
@@ -195,10 +195,10 @@
     maxElementsInMemory="400"/>
   
   <cache name="org.hisp.dhis.reporttable.ReportTable.dataElements"
-    maxElementsInMemory="4000"/>
+    maxElementsInMemory="1500"/>
   
   <cache name="org.hisp.dhis.reporttable.ReportTable.indicators"
-    maxElementsInMemory="1000"/>
+    maxElementsInMemory="500"/>
   
   <cache name="org.hisp.dhis.reporttable.ReportTable.dataSets"
     maxElementsInMemory="100"/>
@@ -209,8 +209,11 @@
   <cache name="org.hisp.dhis.reporttable.ReportTable.units"
     maxElementsInMemory="2000"/>
     
+  <cache name="org.hisp.dhis.chart.Chart.dataElements"
+    maxElementsInMemory="1500"/>
+    
   <cache name="org.hisp.dhis.chart.Chart.indicators"
-    maxElementsInMemory="1000"/>
+    maxElementsInMemory="500"/>
     
   <cache name="org.hisp.dhis.chart.Chart.periods"
     maxElementsInMemory="200"/>

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/Scheduler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/Scheduler.java	2011-02-03 16:35:12 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/Scheduler.java	2011-06-09 20:24:19 +0000
@@ -2,10 +2,8 @@
 
 public interface Scheduler
 {
+    final String CRON_NIGHTLY_0AM = "0 0 0 * * ?";
     final String CRON_NIGHTLY_1AM = "0 0 1 * * ?";
-    final String CRON_NIGHTLY_2AM = "0 0 2 * * ?";
-    final String CRON_NIGHTLY_3AM = "0 0 3 * * ?";
-    final String CRON_NIGHTLY_4AM = "0 0 4 * * ?";
     final String CRON_TEST = "0 * * * * ?";
     
     final String STATUS_RUNNING = "running";

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js	2011-06-09 19:07:37 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js	2011-06-09 20:24:19 +0000
@@ -78,7 +78,8 @@
         setMessage(message);
 
         return false;
-    } else if (type == "success")
+    } 
+    else if (type == "success")
     {
         if ($("#selectedIndicators").attr('multiple') !== undefined)
         {