From 51d0af6df70f95fed1204d5fb14e1cde23b0c3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Fri, 9 Jul 2010 13:58:13 +0200
Subject: [PATCH]  ItEr60S12MellorasGlobalesRendementoItEr59S22: Set up second
 level cache for some classes and collections.

The affected classes and collections are:
    org.navalplanner.business.labels.entities.LabelType
    org.navalplanner.business.labels.entities.LabelType.labels
    org.navalplanner.business.labels.entities.Label
    org.navalplanner.business.calendars.entities.BaseCalendar
    org.navalplanner.business.resources.entities.CriterionType
    org.navalplanner.business.resources.entities.Criterion
    org.navalplanner.business.resources.entities.CriterionType.criterions
    org.navalplanner.business.resources.entities.CriterionSatisfaction
    org.navalplanner.business.resources.entities.Resource
    org.navalplanner.business.resources.entities.Resource.criterionSatisfactions
    org.navalplanner.business.advance.entities.AdvanceType
    org.navalplanner.business.costcategories.entities.TypeOfWorkHours
    org.navalplanner.business.materials.entities.UnitType
    org.navalplanner.business.workreports.entities.WorkReportType
---
 .../src/main/resources/ehcache.xml            | 111 ++++++++++++++++++
 .../business/advance/entities/Advance.hbm.xml |   1 +
 .../calendars/entities/Calendars.hbm.xml      |   1 +
 .../entities/CostCategories.hbm.xml           |   1 +
 .../business/labels/entities/Labels.hbm.xml   |   3 +
 .../materials/entities/Materials.hbm.xml      |   1 +
 .../resources/entities/Resources.hbm.xml      |   6 +
 .../workreports/entities/WorkReports.hbm.xml  |   1 +
 8 files changed, 125 insertions(+)

diff --git a/navalplanner-business/src/main/resources/ehcache.xml b/navalplanner-business/src/main/resources/ehcache.xml
index 519429c36..4e509c79a 100644
--- a/navalplanner-business/src/main/resources/ehcache.xml
+++ b/navalplanner-business/src/main/resources/ehcache.xml
@@ -13,4 +13,115 @@
         overflowToDisk="false"
     />
 
+    <cache name="org.navalplanner.business.labels.entities.LabelType"
+       maxElementsInMemory="100"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.labels.entities.LabelType.labels"
+       maxElementsInMemory="500"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.labels.entities.Label"
+       maxElementsInMemory="500"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.calendars.entities.BaseCalendar"
+       maxElementsInMemory="1000"
+       eternal="true"
+       timeToIdleSeconds="0"
+       timeToLiveSeconds="0"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.resources.entities.CriterionType"
+       maxElementsInMemory="50"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.resources.entities.Criterion"
+       maxElementsInMemory="100"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.resources.entities.CriterionType.criterions"
+       maxElementsInMemory="100"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.resources.entities.CriterionSatisfaction"
+       maxElementsInMemory="5000"
+       eternal="true"
+       timeToIdleSeconds="0"
+       timeToLiveSeconds="0"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.resources.entities.Resource"
+       maxElementsInMemory="500"
+       eternal="true"
+       timeToIdleSeconds="0"
+       timeToLiveSeconds="0"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.resources.entities.Resource.criterionSatisfactions"
+       maxElementsInMemory="5000"
+       eternal="true"
+       timeToIdleSeconds="0"
+       timeToLiveSeconds="0"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.advance.entities.AdvanceType"
+       maxElementsInMemory="100"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.costcategories.entities.TypeOfWorkHours"
+       maxElementsInMemory="50"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.materials.entities.UnitType"
+       maxElementsInMemory="50"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
+
+    <cache name="org.navalplanner.business.workreports.entities.WorkReportType"
+       maxElementsInMemory="50"
+       eternal="false"
+       timeToIdleSeconds="1800"
+       timeToLiveSeconds="1800"
+       overflowToDisk="false"
+    />
 </ehcache>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml
index 7da23bb9f..b0a25b245 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/advance/entities/Advance.hbm.xml
@@ -4,6 +4,7 @@
 
 <!-- AdvanceType -->
 <class name="AdvanceType" >
+    <cache usage="nonstrict-read-write"/>
     <id name="id" type="long" access="property">
         <generator class="hilo">
             <param name="max_lo">100</param>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml
index 1595a8c57..13b8bedd9 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml
@@ -5,6 +5,7 @@
 
     <!-- BaseCalendar -->
     <class name="BaseCalendar">
+        <cache usage="read-write"/>
         <id name="id" access="property" type="long">
             <generator class="hilo">
                 <param name="max_lo">100</param>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml
index 6cc0e7e65..75aa80f36 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml
@@ -51,6 +51,7 @@
 
 <!-- TypeOfWorkHours -->
 <class name="TypeOfWorkHours" table="TYPE_OF_WORK_HOURS">
+    <cache usage="nonstrict-read-write"/>
     <id name="id" type="long" access="property">
         <generator class="hilo">
             <param name="max_lo">100</param>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
index e1ab3b1b0..24ab5443e 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
@@ -4,6 +4,7 @@
 
 <!-- Label -->
 <class name="Label" table="LABEL">
+    <cache usage="nonstrict-read-write"/>
     <id name="id" type="long" access="property">
         <generator class="hilo">
             <param name="max_lo">100</param>
@@ -29,6 +30,7 @@
 
 <!-- LabelType -->
 <class name="LabelType" table="LABEL_TYPE">
+    <cache usage="nonstrict-read-write"/>
     <id name="id" type="long" access="property">
         <generator class="hilo">
             <param name="max_lo">100</param>
@@ -42,6 +44,7 @@
 
     <!-- Indexed the other side -->
     <set name="labels" inverse="false" cascade="all">
+        <cache usage="nonstrict-read-write"/>
         <key column="LABEL_TYPE_ID"/>
         <one-to-many class="Label"/>
     </set>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml
index dbc2e57a8..f7cdc00ee 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml
@@ -32,6 +32,7 @@
 
 <!-- UnitType -->
 <class name="UnitType" table="UNIT_TYPE">
+    <cache usage="nonstrict-read-write"/>
 
     <id name="id" type="long" access="property">
         <generator class="hilo">
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
index ed61a11f4..314b42a68 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/resources/entities/Resources.hbm.xml
@@ -3,6 +3,7 @@
 <hibernate-mapping default-access="field" package="org.navalplanner.business.resources.entities">
 
   <class name="Resource">
+    <cache usage="read-write"/>
     <id name="id" access="property" type="long">
       <generator class="hilo">
         <param name="max_lo">100</param>
@@ -22,6 +23,7 @@
 
     <!-- It is appropiate the index by the foreign key in the many-to-one side -->
     <set access="field" cascade="all-delete-orphan" inverse="true" name="criterionSatisfactions">
+      <cache usage="read-write"/>
       <key column="resource" not-null="true"/>
       <one-to-many class="CriterionSatisfaction"/>
     </set>
@@ -94,6 +96,7 @@
 
   <!-- Criterion -->
   <class name="Criterion">
+    <cache usage="nonstrict-read-write"/>
     <id name="id" access="property" type="long">
       <generator class="hilo">
         <param name="max_lo">100</param>
@@ -132,6 +135,7 @@
 
   <!-- CriterionSatisfaction -->
   <class name="CriterionSatisfaction">
+    <cache usage="read-write"/>
     <id name="id" access="property" type="long">
       <generator class="hilo">
         <param name="max_lo">100</param>
@@ -152,6 +156,7 @@
 
   <!-- CriterionType -->
   <class name="CriterionType">
+    <cache usage="nonstrict-read-write"/>
     <id name="id" access="property" type="long">
       <generator class="hilo"/>
     </id>
@@ -171,6 +176,7 @@
 
     <!-- Indexed the other side-->
     <set name="criterions" cascade="all,delete-orphan" inverse="true">
+        <cache usage="nonstrict-read-write"/>
         <key column="id_criterion_type" />
         <one-to-many class="Criterion" />
     </set>
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml
index 3d576e45f..a911301de 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/workreports/entities/WorkReports.hbm.xml
@@ -4,6 +4,7 @@
 
 <!-- WorkReportType -->
 <class name="WorkReportType" table="WORK_REPORT_TYPE">
+    <cache usage="nonstrict-read-write"/>
     <id name="id" type="long" access="property">
         <generator class="hilo">
             <param name="max_lo">100</param>