dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5925
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2012-02-12 20:37:55 +0100
message:
  Updated ehcaches
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/option/hibernate/OptionSet.hbm.xml
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.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-core/src/main/resources/org/hisp/dhis/option/hibernate/OptionSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/option/hibernate/OptionSet.hbm.xml	2012-02-10 06:41:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/option/hibernate/OptionSet.hbm.xml	2012-02-12 19:37:55 +0000
@@ -16,9 +16,10 @@
     &identifiableProperties;
     
     <list name="options" table="optionsetmembers">
-		<key column="optionsetid" foreign-key="fk_optionsetmembers_optionsetid" />
-		<list-index column="sort_order" />
-		<element type="text" column="optionvalue"/>
+	  <cache usage="read-write" />
+	  <key column="optionsetid" foreign-key="fk_optionsetmembers_optionsetid" />
+	  <list-index column="sort_order" />
+	  <element type="text" column="optionvalue"/>
 	</list>
     
   </class>

=== 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-12-22 19:59:19 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2012-02-12 19:37:55 +0000
@@ -64,7 +64,7 @@
 
   <cache name="org.hisp.dhis.user.UserCredentials.userAuthorityGroups" maxElementsInMemory="200" />
 
-  <cache name="org.hisp.dhis.options.SystemSetting" maxElementsInMemory="200" />
+  <cache name="org.hisp.dhis.setting.SystemSetting" maxElementsInMemory="200" />
 
   <cache name="org.hisp.dhis.translation.Translation" maxElementsInMemory="200000" />
 
@@ -94,6 +94,10 @@
 
   <cache name="org.hisp.dhis.attribute.AttributeValue" maxElementsInMemory="5000" />
 
+  <cache name="org.hisp.dhis.option.OptionSet" maxElementsInMemory="50" />
+  
+  <cache name="org.hisp.dhis.dataset.LockException" maxElementsInMemory="1000" />
+
   <!-- Hibernate Associations -->
 
   <cache name="org.hisp.dhis.dataelement.DataElementCategoryCombo.categories" maxElementsInMemory="300" />
@@ -112,6 +116,8 @@
 
   <cache name="org.hisp.dhis.dataset.DataSet.sections" maxElementsInMemory="3000" />
 
+  <cache name="org.hisp.dhis.dataset.DataSet.lockExceptions" maxElementsInMemory="1000" />
+
   <cache name="org.hisp.dhis.dataelement.DataElement.groups" maxElementsInMemory="3000" />
 
   <cache name="org.hisp.dhis.dataelement.DataElement.dataSets" maxElementsInMemory="3000" />
@@ -150,8 +156,7 @@
 
   <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroup.members" maxElementsInMemory="10000" />
 
-  <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet.organisationUnitGroups"
-    maxElementsInMemory="400" />
+  <cache name="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet.organisationUnitGroups" maxElementsInMemory="400" />
 
   <cache name="org.hisp.dhis.reporttable.ReportTable.dataElements" maxElementsInMemory="1500" />
 
@@ -182,6 +187,8 @@
   <cache name="org.hisp.dhis.attribute.Attribute.attributeValues" maxElementsInMemory="5000" />
 
   <cache name="org.hisp.dhis.attribute.AttributeOption.attributes" maxElementsInMemory="500" />
+  
+  <cache name="org.hisp.dhis.option.OptionSet.options" maxElementsInMemory="2000" />
 
   <!-- Hibernate Query Cache -->