Changed module tests to use memory-resident JCR repository for much f…

…aster test execution
fcrepo · Feb 8, 2013 · 3f21576 · 3f21576
1 parent 73b7e66
commit 3f21576
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 157 deletions.
diff --git a/fcrepo-dc/src/test/resources/infinispan_configuration.xml b/fcrepo-dc/src/test/resources/infinispan_configuration.xml
diff --git a/fcrepo-dc/src/test/resources/my_repository.json b/fcrepo-dc/src/test/resources/my_repository.json
@@ -6,29 +6,6 @@
         "default" : "fedora",
         "allowCreation" : true
     },
-    "clustering" : {
-        "clusterName" : "modeshape",
-        "channelConfiguration" : "${fcrepo.modeshape.jgroups.configuration:jgroups-modeshape.xml}"
-    },
-    "query" : {
-        "enabled" : true,
-        "rebuildUponStartup" : "if_missing",
-        "indexStorage" : {
-            "type" : "filesystem",
-            "location" : "${fcrepo.modeshape.index.location:indexes}",
-            "lockingStrategy" : "native",
-            "fileSystemAccessType" : "auto"
-        }
-    },
-    "storage" : {
-        "cacheName" : "FedoraRepository",
-        "cacheConfiguration" : "infinispan_configuration.xml",
-        "binaryStorage" : {
-            "type" : "cache",
-            "dataCacheName" : "FedoraRepository",
-            "metadataCacheName" : "FedoraRepository"
-        }
-    },
     "security" : {
         "anonymous" : {
             "roles" : ["readonly","readwrite","admin"],
@@ -38,5 +15,5 @@
             { "classname" : "servlet" }
         ]
     },
-"node-types" : ["fedora-node-types.cnd"]
+	"node-types" : ["fedora-node-types.cnd"]
 }
diff --git a/fcrepo-jms/src/test/resources/logback.xml → ...o-jms/src/test/resources/logback-test.xml b/fcrepo-jms/src/test/resources/logback.xml → ...o-jms/src/test/resources/logback-test.xml
@@ -10,13 +10,7 @@
     <logger name="org.fcrepo" additivity="false" level="DEBUG">
         <appender-ref ref="STDOUT"/>
     </logger>
-    <logger name="org.modeshape" additivity="false" level="DEBUG">
-        <appender-ref ref="STDOUT"/>
-    </logger>
-    <logger name="org.springframework" additivity="false" level="INFO">
-        <appender-ref ref="STDOUT"/>
-    </logger>
-    <root additivity="false" level="INFO">
+    <root additivity="false" level="WARN">
         <appender-ref ref="STDOUT"/>
     </root>
 </configuration>
diff --git a/fcrepo-jms/src/test/resources/my_repository.json b/fcrepo-jms/src/test/resources/my_repository.json
@@ -6,29 +6,6 @@
         "default" : "fedora",
         "allowCreation" : true
     },
-    "clustering" : {
-        "clusterName" : "modeshape",
-        "channelConfiguration" : "${fcrepo.modeshape.jgroups.configuration:jgroups-modeshape.xml}"
-    },
-    "query" : {
-        "enabled" : true,
-        "rebuildUponStartup" : "if_missing",
-        "indexStorage" : {
-            "type" : "filesystem",
-            "location" : "${fcrepo.modeshape.index.location:indexes}",
-            "lockingStrategy" : "native",
-            "fileSystemAccessType" : "auto"
-        }
-    },
-    "storage" : {
-        "cacheName" : "FedoraRepository",
-        "cacheConfiguration" : "infinispan_configuration.xml",
-        "binaryStorage" : {
-            "type" : "cache",
-            "dataCacheName" : "FedoraRepository",
-            "metadataCacheName" : "FedoraRepository"
-        }
-    },
     "security" : {
         "anonymous" : {
             "roles" : ["readonly","readwrite","admin"],
@@ -38,16 +15,5 @@
             { "classname" : "servlet" }
         ]
     },
-    "sequencing" : {
-        "removeDerivedContentWithOriginal" : true,
-
-        "sequencers" : {
-            "FOXML Eater" : {
-                "description" : "FOXML Files loaded under 'fedora:/foxml' and extracted into 'fedora:/'",
-                "classname" : "org.fcrepo.foxml.FOXMLSequencer",
-                "pathExpressions" : ["fedora:/foxml/(.*)/jcr:content[@jcr:data] => fedora:/$1"]
-            }
-        }
-    },
-"node-types" : ["fedora-node-types.cnd"]
+	"node-types" : ["fedora-node-types.cnd"]
 }