MODE/ISPN config tweaks

fcrepo · Feb 25, 2013 · af35080 · af35080
1 parent c8910d3
commit af35080
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/fcrepo-webapp/src/main/resources/config/infinispan_configuration.xml b/fcrepo-webapp/src/main/resources/config/infinispan_configuration.xml
@@ -6,7 +6,7 @@
       <!-- Defines the global settings shared by all caches -->
       <transport>
          <properties>
-            <property name="configurationFile" value="${fcrepo.modeshape.ispn.configuration:config/jgroups-infinispan.xml}"/>
+            <property name="configurationFile" value="${fcrepo.ispn.jgroups.configuration:config/jgroups-infinispan.xml}"/>
          </properties>
       </transport>
    </global>
@@ -51,18 +51,18 @@
           We can have multiple cache loaders, which get chained. But we'll define just one.
        -->
 
-      <loaders passivation="false" shared="false" preload="true">
+      <loaders passivation="false" shared="false" preload="false">
 
          <!-- 
             The 'fetchPersistentState' attribute applies when this cache joins the cluster; the value doesn't 
             really matter to us in this case. See the documentation for more options.
           -->
-         <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false"
-            purgeOnStartup="true">
+         <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true"
+            purgeOnStartup="false">
             <!-- See the documentation for more configuration examples and flags. -->
             <properties>
                <!-- We have to set the location where we want to store the data. -->
-               <property name="location" value="target/FedoraRepository/storage"/>
+               <property name="location" value="${fcrepo.ispn.CacheDirPath:target/FedoraRepository/storage}"/>
 
                 <property name="fsyncMode" value="perWrite"/>
             </properties>
@@ -78,14 +78,7 @@
              <async enabled="true" flushLockTimeout="15000" threadPoolSize="5"/>
              -->
          </loader>
-         <!-- fall back to other nodes if we don't have this data -->
-         <loader class="org.infinispan.loaders.cluster.ClusterCacheLoader"
-            fetchPersistentState="false" purgeOnStartup="false">
-            <properties>
-               <property name="remoteCallTimeout" value="20000"/>
-            </properties>
-
-         </loader>
+
       </loaders>
    </namedCache>
 </infinispan>
diff --git a/fcrepo-webapp/src/main/resources/config/repository.json b/fcrepo-webapp/src/main/resources/config/repository.json
@@ -15,7 +15,7 @@
         "rebuildUponStartup" : "if_missing",
         "indexStorage" : {
             "type" : "filesystem",
-            "location" : "${fcrepo.modeshape.index.location:indexes}",
+            "location" : "${fcrepo.modeshape.index.location:target/indexes}",
             "lockingStrategy" : "native",
             "fileSystemAccessType" : "auto"
         }