NOJIRA: Fixing 'ehcache' warning during import of AuthN/AuthZ metadata. Problem...

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 949b7ba8addd5e03be85c8ef5eceefe532da1108..4600233e97a7a483349836ae1eaeda6d090fbed5 100644 (file)
--- 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 7818a18101c0c2b4fe565a89bd6a4712d94192f7..50b63fc88172acb1fb957e029172087e78a6f31b 100644 (file)
--- 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 (file)
index 0000000..d68d697
--- /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 816f5b6f7d085caa02ba1e9996babbc57a838275..a88d2d5d4ae35e8cf2ab6cb60e28a8b75cf929d2 100644 (file)
--- 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>