From b40d6678e32c2db05e5287023f8cd1a23d678fbd 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:12 +0200
Subject: [PATCH]  ItEr60S12MellorasGlobalesRendementoItEr59S22: Configure
 Hibernate second level cache.

It is left disabled by default, it has to be enabled in the file navalplanner-business-hibernate.cfg.xml.
---
 navalplanner-business/pom.xml                    |  4 ++++
 .../src/main/resources/ehcache.xml               | 16 ++++++++++++++++
 .../navalplanner-business-hibernate.cfg.xml      |  7 +++++++
 .../navalplanner-business-hibernate-test.cfg.xml |  7 +++++++
 .../navalplanner-webapp-hibernate-test.cfg.xml   |  7 +++++++
 pom.xml                                          |  5 +++++
 6 files changed, 46 insertions(+)
 create mode 100644 navalplanner-business/src/main/resources/ehcache.xml

diff --git a/navalplanner-business/pom.xml b/navalplanner-business/pom.xml
index d377c91e2..29fae58ec 100644
--- a/navalplanner-business/pom.xml
+++ b/navalplanner-business/pom.xml
@@ -108,5 +108,9 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/navalplanner-business/src/main/resources/ehcache.xml b/navalplanner-business/src/main/resources/ehcache.xml
new file mode 100644
index 000000000..519429c36
--- /dev/null
+++ b/navalplanner-business/src/main/resources/ehcache.xml
@@ -0,0 +1,16 @@
+<ehcache>
+    <!-- Uncomment the next line if you want to enable
+      overflowToDisk (only recommended when the DB server
+      is in a different machine)
+    <diskStore path="java.io.tmpdir"/>
+    -->
+
+    <defaultCache
+        maxElementsInMemory="1000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="false"
+    />
+
+</ehcache>
diff --git a/navalplanner-business/src/main/resources/navalplanner-business-hibernate.cfg.xml b/navalplanner-business/src/main/resources/navalplanner-business-hibernate.cfg.xml
index f237c33bb..d0b487d19 100644
--- a/navalplanner-business/src/main/resources/navalplanner-business-hibernate.cfg.xml
+++ b/navalplanner-business/src/main/resources/navalplanner-business-hibernate.cfg.xml
@@ -9,5 +9,12 @@
         <property name="hibernate.format_sql">${hibernate.format_sql}</property>
         <property name="hibernate.use_sql_comments">${hibernate.use_sql_comments}</property>
         <property name="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</property>
+
+        <!-- Configure second level cache -->
+        <property name="hibernate.cache.provider_class">net.sf.ehcache.hibernate.EhCacheProvider</property>
+        <property name="hibernate.cache.use_second_level_cache">false</property>
+        <property name="hibernate.cache.use_query_cache">false</property>
+        <property name="hibernate.cache.provider_configuration_file_resource_path">classpath:ehcache.xml</property>
+
     </session-factory>
 </hibernate-configuration>
diff --git a/navalplanner-business/src/test/resources/navalplanner-business-hibernate-test.cfg.xml b/navalplanner-business/src/test/resources/navalplanner-business-hibernate-test.cfg.xml
index a4466c283..3f44baa11 100644
--- a/navalplanner-business/src/test/resources/navalplanner-business-hibernate-test.cfg.xml
+++ b/navalplanner-business/src/test/resources/navalplanner-business-hibernate-test.cfg.xml
@@ -8,5 +8,12 @@
         <property name="hibernate.format_sql">true</property>
         <property name="hibernate.use_sql_comments">true</property>
         <property name="hibernate.hbm2ddl.auto">create</property>
+
+        <!-- Configure second level cache -->
+        <property name="hibernate.cache.provider_class">net.sf.ehcache.hibernate.EhCacheProvider</property>
+        <property name="hibernate.cache.use_second_level_cache">false</property>
+        <property name="hibernate.cache.use_query_cache">false</property>
+        <property name="hibernate.cache.provider_configuration_file_resource_path">classpath:ehcache.xml</property>
+
     </session-factory>
 </hibernate-configuration>
diff --git a/navalplanner-webapp/src/test/resources/navalplanner-webapp-hibernate-test.cfg.xml b/navalplanner-webapp/src/test/resources/navalplanner-webapp-hibernate-test.cfg.xml
index a4466c283..3f44baa11 100644
--- a/navalplanner-webapp/src/test/resources/navalplanner-webapp-hibernate-test.cfg.xml
+++ b/navalplanner-webapp/src/test/resources/navalplanner-webapp-hibernate-test.cfg.xml
@@ -8,5 +8,12 @@
         <property name="hibernate.format_sql">true</property>
         <property name="hibernate.use_sql_comments">true</property>
         <property name="hibernate.hbm2ddl.auto">create</property>
+
+        <!-- Configure second level cache -->
+        <property name="hibernate.cache.provider_class">net.sf.ehcache.hibernate.EhCacheProvider</property>
+        <property name="hibernate.cache.use_second_level_cache">false</property>
+        <property name="hibernate.cache.use_query_cache">false</property>
+        <property name="hibernate.cache.provider_configuration_file_resource_path">classpath:ehcache.xml</property>
+
     </session-factory>
 </hibernate-configuration>
diff --git a/pom.xml b/pom.xml
index 588de8567..f741ede9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -554,6 +554,11 @@
                 <artifactId>timelinez</artifactId>
                 <version>1.2_1</version>
             </dependency>
+            <dependency>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache</artifactId>
+                <version>1.6.2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>