[jboss-cvs] JBossAS SVN: r107527 - branches/infinispan-int/cluster/src/resources/infinispan.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-08-10 14:27:04 -0400 (Tue, 10 Aug 2010)
New Revision: 107527

Modified:
   branches/infinispan-int/cluster/src/resources/infinispan/infinispan-configs.xml
Log:
All Hibernate 2LC caches should come from same container.

Modified: branches/infinispan-int/cluster/src/resources/infinispan/infinispan-configs.xml
===================================================================
--- branches/infinispan-int/cluster/src/resources/infinispan/infinispan-configs.xml	2010-08-10 18:25:58 UTC (rev 107526)
+++ branches/infinispan-int/cluster/src/resources/infinispan/infinispan-configs.xml	2010-08-10 18:27:04 UTC (rev 107527)
@@ -90,8 +90,8 @@
     </infinispan>
   </infinispan-config>
 
-  <!-- Hibernate second level cache for entities -->
-  <infinispan-config name="entity">
+  <!-- Hibernate second-level cache -->
+  <infinispan-config name="entity" jndi-name="">
     <infinispan xmlns="urn:infinispan:config:4.0" xsi:schemaLocation="urn:infinispan:config:4.0 http://docs.jboss.org/infinispan/schemas/infinispan-config-4.1.xsd">
       <global>
         <transport clusterName="${jboss.partition.name:DefaultPartition}-entity" distributedSyncTimeout="17500">
@@ -108,76 +108,22 @@
           <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
           <sync replTimeout="20000"/>
         </clustering>
-       <eviction strategy="LRU" wakeUpInterval="5000" maxEntries="10000"/>
-       <expiration maxIdle="100000"/>
-       </default>
+        <eviction strategy="LRU" wakeUpInterval="5000" maxEntries="10000"/>
+        <expiration maxIdle="100000"/>
+      </default>
+      <namedCache name="local-query">
+        <clustering mode="local"></clustering>
+      </namedCache>
+      <namedCache name="replicated-query">
+        <clustering mode="replication"></clustering>
+      </namedCache>
+      <namedCache name="timestamps">
+        <clustering mode="replication"></clustering>
+        <eviction strategy="NONE" wakeUpInterval="0"/>
+      </namedCache>
     </infinispan>
   </infinispan-config>
 
-  <!-- Hibernate (local only) second level cache for query caching  -->
-  <infinispan-config name="local-query">
-    <infinispan xmlns="urn:infinispan:config:4.0" xsi:schemaLocation="urn:infinispan:config:4.0 http://docs.jboss.org/infinispan/schemas/infinispan-config-4.1.xsd">
- 
-       <default>
-        <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
-        <jmxStatistics enabled="true"/>
-       <eviction strategy="LRU" wakeUpInterval="5000" maxEntries="10000"/>
-       <expiration maxIdle="100000"/>
-       </default>
-    </infinispan>
-  </infinispan-config>
-
-  <!-- Hibernate (clustered) second level cache for query caching.  Replication is asynchronous.  -->
-  <infinispan-config name="replicated-query">
-    <infinispan xmlns="urn:infinispan:config:4.0" xsi:schemaLocation="urn:infinispan:config:4.0 http://docs.jboss.org/infinispan/schemas/infinispan-config-4.1.xsd">
-       <global>
-        <transport clusterName="${jboss.partition.name:DefaultPartition}-query" distributedSyncTimeout="17500">
-          <properties>
-            <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
-          </properties>
-        </transport>
-       </global>
-    
-       <default>
-        <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
-        <jmxStatistics enabled="true"/>
-        <lazyDeserialization enabled="true"/>
-        <clustering mode="replication">
-          <stateRetrieval fetchInMemoryState="false"/>
-          <async/>
-        </clustering>
-       <eviction strategy="LRU" wakeUpInterval="5000" maxEntries="10000"/>
-       <expiration maxIdle="100000"/>
-       </default>
-    </infinispan>
-  </infinispan-config>
-
-   <!-- Hibernate timestamp caching. A clustered timestamp cache
-        is required if query caching is used, even if the query cache
-        itself is configured with CacheMode=LOCAL. -->
-  <infinispan-config name="timestamps">
-    <infinispan xmlns="urn:infinispan:config:4.0" xsi:schemaLocation="urn:infinispan:config:4.0 http://docs.jboss.org/infinispan/schemas/infinispan-config-4.1.xsd">
-       <global>
-        <transport clusterName="${jboss.partition.name:DefaultPartition}-timestamps" distributedSyncTimeout="17500">
-          <properties>
-            <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
-          </properties>
-        </transport>
-       </global>
-    
-       <default>
-        <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
-        <jmxStatistics enabled="true"/>
-        <lazyDeserialization enabled="true"/>
-        <clustering mode="replication">
-          <stateRetrieval fetchInMemoryState="false"/>
-          <async/>
-        </clustering>
-       <eviction strategy="NONE" wakeUpInterval="0"/>
-       </default>
-    </infinispan>
-  </infinispan-config>
-
 </infinispan-configs>