HSEARCH-1300 Reference Infinispan configuration no longer requires ba…

…tching
hibernate · Apr 11, 2013 · 2ab8ef1 · 2ab8ef1
1 parent 3fda4ef
commit 2ab8ef1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/hibernate-search-infinispan/src/main/resources/default-hibernatesearch-infinispan.xml b/hibernate-search-infinispan/src/main/resources/default-hibernatesearch-infinispan.xml
@@ -22,10 +22,10 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
   -->
-  <infinispan
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
-      xmlns="urn:infinispan:config:5.2">
+<infinispan
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
+    xmlns="urn:infinispan:config:5.2">
 
     <!-- *************************** -->
     <!-- System-wide global settings -->
@@ -37,7 +37,7 @@
             of Hibernate Search applications work - if possible it would be better to use JNDI to share 
             the CacheManager across applications -->
         <globalJmxStatistics
-            enabled="true"
+            enabled="false"
             cacheManagerName="HibernateSearch"
             allowDuplicateDomains="true" />
 
@@ -75,9 +75,8 @@
             concurrencyLevel="500"
             useLockStriping="false" />
 
-        <!-- Invocation batching is required for use with the Lucene Directory -->
         <invocationBatching
-            enabled="true" />
+            enabled="false" />
 
         <!-- This element specifies that the cache is clustered. modes supported: distribution 
             (d), replication (r) or invalidation (i). Don't use invalidation to store Lucene indexes (as 
@@ -161,4 +160,4 @@
         </clustering>
     </namedCache>
 
-</infinispan>
+</infinispan>
diff --git a/...nate-search-infinispan/src/test/java/org/hibernate/search/infinispan/StoredIndexTest.java b/...nate-search-infinispan/src/test/java/org/hibernate/search/infinispan/StoredIndexTest.java
@@ -134,7 +134,8 @@ private void startNode(boolean createSchema) {
 
 	/**
 	 * Closes the SessionFactory, SearchFactory and Infinispan CacheManagers.
-	 * Only service to survive is the H2 in memory database.
+	 * Only service to survive is the H2 in memory database, and the data stored by the
+	 * CacheLoader enabled in the Infinispan configuration.
 	 */
 	public void stopNode() {
 		if ( node != null ) {

diff --git a/hibernate-search-infinispan/src/test/resources/filesystem-loading-infinispan.xml b/hibernate-search-infinispan/src/test/resources/filesystem-loading-infinispan.xml
@@ -24,8 +24,8 @@
   -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd"
-      xmlns="urn:infinispan:config:5.1">
+      xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd"
+      xmlns="urn:infinispan:config:5.2">
 
   <global>
     <globalJmxStatistics enabled="false" />
@@ -43,7 +43,7 @@
       concurrencyLevel="5000"
       useLockStriping="false" />
     <invocationBatching
-      enabled="true" />
+      enabled="false" />
   </default>
 
   <namedCache name="LuceneIndexesMetadata">