fix webapp config paths

fcrepo · Feb 13, 2013 · d9a331b · d9a331b
1 parent 3986f91
commit d9a331b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 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:jgroups-infinispan.xml}"/>
+            <property name="configurationFile" value="${fcrepo.modeshape.ispn.configuration:config/jgroups-infinispan.xml}"/>
          </properties>
       </transport>
    </global>

diff --git a/fcrepo-webapp/src/main/resources/config/jgroups-modeshape.xml b/fcrepo-webapp/src/main/resources/config/jgroups-modeshape.xml
@@ -23,6 +23,9 @@
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.2.xsd">
+
+
+
     <TCP
             bind_addr="${jgroups.modeshape.tcp.address:127.0.0.1}"
             bind_port="${jgroups.modeshape.tcp.port:7850}"

diff --git a/fcrepo-webapp/src/main/resources/config/repository.json b/fcrepo-webapp/src/main/resources/config/repository.json
@@ -8,7 +8,7 @@
     },
     "clustering" : {
         "clusterName" : "modeshape",
-        "channelConfiguration" : "${fcrepo.modeshape.jgroups.configuration:jgroups-modeshape.xml}"
+        "channelConfiguration" : "${fcrepo.modeshape.jgroups.configuration:config/jgroups-modeshape.xml}"
     },
     "query" : {
         "enabled" : true,
@@ -22,7 +22,7 @@
     },
     "storage" : {
         "cacheName" : "FedoraRepository",
-        "cacheConfiguration" : "infinispan_configuration.xml",
+        "cacheConfiguration" : "config/infinispan_configuration.xml",
         "binaryStorage" : {
             "type" : "cache",
             "dataCacheName" : "FedoraRepository",