From a5f992468a76b66388499082237bd13a8489aa2c Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@berkeley.edu>
Date: Thu, 1 Aug 2013 22:46:52 -0700
Subject: [PATCH] NOJIRA: Fixing 'ehcache' warning during import of AuthN/AuthZ
 metadata.  Problem was that both Spring Security and JPA/Hibernate were
 configuring an ehCache manager.

---
 .../java/org/collectionspace/ImportAuthz.java     |  2 --
 .../applicationContext-authorization-test.xml     |  4 +++-
 .../import/src/main/resources/ehcache.xml         | 15 +++++++++++++++
 .../applicationContext-authorization.xml          |  4 +++-
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 services/authorization-mgt/import/src/main/resources/ehcache.xml

diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
index 949b7ba8a..4600233e9 100644
--- a/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
+++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
@@ -89,13 +89,11 @@ public class ImportAuthz {
     		String password,
     		String tenantBinding,
     		String exportDir) {
-    	logInfo(LOGGING_SEPARATOR_HEAD);
     	logInfo("Creating CollectionSpace authorization metadata using the following settings:");
     	logInfo("\tuser=" + user);
     	logInfo("\tpassword=" + password);
     	logInfo("\ttenantBinding=" + tenantBinding);
     	logInfo("\texportDir=" + exportDir);
-    	logInfo(LOGGING_SEPARATOR_TAIL);
     }
     
     private static void printUsage(PrintStream outStream) {
diff --git a/services/authorization-mgt/import/src/main/resources/applicationContext-authorization-test.xml b/services/authorization-mgt/import/src/main/resources/applicationContext-authorization-test.xml
index 7818a1810..50b63fc88 100644
--- a/services/authorization-mgt/import/src/main/resources/applicationContext-authorization-test.xml
+++ b/services/authorization-mgt/import/src/main/resources/applicationContext-authorization-test.xml
@@ -71,7 +71,9 @@
         <constructor-arg>
             <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
                 <property name="cacheManager">
-                    <bean class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/>
+                    <bean class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+						<property name="shared" value="true"/>
+					</bean>
                 </property>
                 <property name="cacheName" value="aclCache"/>
             </bean>
diff --git a/services/authorization-mgt/import/src/main/resources/ehcache.xml b/services/authorization-mgt/import/src/main/resources/ehcache.xml
new file mode 100644
index 000000000..d68d697d4
--- /dev/null
+++ b/services/authorization-mgt/import/src/main/resources/ehcache.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ehcache>
+    <diskStore path="java.io.tmpdir"/>
+    <defaultCache
+            maxElementsInMemory="50000"
+            eternal="false"
+            timeToIdleSeconds="120"
+            timeToLiveSeconds="120"
+            overflowToDisk="true"
+            diskPersistent="false"
+            diskExpiryThreadIntervalSeconds="120"
+            memoryStoreEvictionPolicy="LRU"
+            />
+</ehcache>
\ No newline at end of file
diff --git a/services/authorization/service/src/main/resources/applicationContext-authorization.xml b/services/authorization/service/src/main/resources/applicationContext-authorization.xml
index 816f5b6f7..a88d2d5d4 100644
--- a/services/authorization/service/src/main/resources/applicationContext-authorization.xml
+++ b/services/authorization/service/src/main/resources/applicationContext-authorization.xml
@@ -77,7 +77,9 @@
         <constructor-arg>
             <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean">
                 <property name="cacheManager">
-                    <bean class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/>
+                    <bean class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+						<property name="shared" value="true"/>
+					</bean>
                 </property>
                 <property name="cacheName" value="aclCache"/>
             </bean>
-- 
2.47.3