Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Now using non-clustered INSPN for kernel tests, for better test speed
  • Loading branch information
ajs6f committed Feb 8, 2013
1 parent 114bde2 commit 1f7521e
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 20 deletions.
2 changes: 1 addition & 1 deletion fcrepo-kernel/src/test/resources/spring-test/repo.xml
Expand Up @@ -17,7 +17,7 @@

<bean class="org.springframework.core.io.ClassPathResource">
<qualifier type="ModeShapeRepositoryConfiguration"/>
<constructor-arg type="String" value="my_repository.json"/>
<constructor-arg type="String" value="test_repository.json"/>
</bean>


Expand Down
Expand Up @@ -4,24 +4,13 @@

<global>
<!-- Defines the global settings shared by all caches -->
<transport>
<properties>
<property name="configurationFile" value="jgroups-tcp.xml"/>
</properties>
</transport>
</global>

<default>
<!--
Defines the default behavior for all caches, including those created dynamically (e.g., when a
repository uses a cache that doesn't exist in this configuration).
-->
<clustering mode="distribution">
<sync/>
<l1 enabled="false" lifespan="0" onRehash="false"/>
<hash numOwners="1"/>
<stateTransfer fetchInMemoryState="true"/>
</clustering>
</default>

<namedCache name="FedoraRepository">
Expand All @@ -30,12 +19,6 @@
use pessimistic locking, which is required whenever applications will be concurrently
updating nodes within the same process. If you're not sure, use pessimistic locking.
-->
<clustering mode="distribution">
<sync/>
<l1 enabled="false" lifespan="0" onRehash="false"/>
<hash numOwners="1"/>
<stateTransfer fetchInMemoryState="true"/>
</clustering>
<transaction
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
transactionMode="TRANSACTIONAL" lockingMode="PESSIMISTIC"/>
Expand All @@ -47,7 +30,7 @@
We can have multiple cache loaders, which get chained. But we'll define just one.
-->
<loaders passivation="false" shared="true" preload="true">
<loaders passivation="false" shared="false" preload="true">

<!--
The 'fetchPersistentState' attribute applies when this cache joins the cluster; the value doesn't
Expand All @@ -58,7 +41,7 @@
<!-- 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="FedoraRepository/storage"/>
<property name="location" value="target/FedoraRepository/storage"/>
</properties>
<!-- This repository isn't clustered, so we could set up the SingletonStore.
singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/>
Expand Down
39 changes: 39 additions & 0 deletions fcrepo-kernel/src/test/resources/test_repository.json
@@ -0,0 +1,39 @@
{
"name" : "repo",
"jndiName" : "",
"workspaces" : {
"predefined" : ["fedora"],
"default" : "fedora",
"allowCreation" : true
},
"storage" : {
"cacheName" : "FedoraRepository",
"cacheConfiguration" : "test_infinispan_configuration.xml",
"binaryStorage" : {
"type" : "cache",
"dataCacheName" : "FedoraRepository",
"metadataCacheName" : "FedoraRepository"
}
},
"security" : {
"anonymous" : {
"roles" : ["readonly","readwrite","admin"],
"useOnFailedLogin" : false
},
"providers" : [
{ "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"]
}

0 comments on commit 1f7521e

Please sign in to comment.