Merge pull request #38 from cul/fedora-3.8.1-with-risearch

Fedora 3.8.1 with risearch
samvera-deprecated · Aug 26, 2015 · 6d59ac1 · 6d59ac1
2 parents 3e72b77 + f4b652e
commit 6d59ac1
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,6 @@ logs/*
 derby.log
 jettywrapper.log
 *.log
+
+# OS-specific files
+.DS_Store
diff --git a/fedora/default/server/config/fedora.fcfg b/fedora/default/server/config/fedora.fcfg
@@ -342,7 +342,7 @@ https://wiki.duraspace.org/display/FEDORA36/Spring+Security
   </module>
   <module role="org.fcrepo.server.resourceIndex.ResourceIndex" class="org.fcrepo.server.resourceIndex.ResourceIndexModule">
     <comment>Supports the ResourceIndex.</comment>
-    <param name="level" value="0">
+    <param name="level" value="1">
       <comment>(required) 
             Index level. Currently, only 0, and 1 are supported levels. 
             0 = off and 1 = on.

diff --git a/fedora/test/server/config/fedora.fcfg b/fedora/test/server/config/fedora.fcfg
@@ -342,7 +342,7 @@ https://wiki.duraspace.org/display/FEDORA36/Spring+Security
   </module>
   <module role="org.fcrepo.server.resourceIndex.ResourceIndex" class="org.fcrepo.server.resourceIndex.ResourceIndexModule">
     <comment>Supports the ResourceIndex.</comment>
-    <param name="level" value="0">
+    <param name="level" value="1">
       <comment>(required) 
             Index level. Currently, only 0, and 1 are supported levels. 
             0 = off and 1 = on.

diff --git a/lib/ext/log4j-1.2.17.jar b/lib/ext/log4j-1.2.17.jar
diff --git a/lib/ext/log4j-over-slf4j-1.7.12.jar b/lib/ext/log4j-over-slf4j-1.7.12.jar
diff --git a/lib/ext/logback-classic-1.1.3.jar b/lib/ext/logback-classic-1.1.3.jar
diff --git a/lib/ext/logback-core-1.1.3.jar b/lib/ext/logback-core-1.1.3.jar
diff --git a/lib/ext/slf4j-log4j12-1.7.6.jar b/lib/ext/slf4j-log4j12-1.7.6.jar
diff --git a/webapps/fedora.war b/webapps/fedora.war