[jboss-cvs] JBossAS SVN: r72966 - in trunk/cluster/src: resources/jboss-cache-manager.sar/META-INF and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2008-05-01 20:59:05 -0400 (Thu, 01 May 2008)
New Revision: 72966

Modified:
   trunk/cluster/src/etc/jboss-cache-manager-beans.xml
   trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-cache-configs.xml
   trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-cache-manager-beans.xml
Log:
[JBAS-5501] CacheManager to support aliasing of caches

Modified: trunk/cluster/src/etc/jboss-cache-manager-beans.xml
===================================================================
--- trunk/cluster/src/etc/jboss-cache-manager-beans.xml	2008-05-02 00:57:00 UTC (rev 72965)
+++ trunk/cluster/src/etc/jboss-cache-manager-beans.xml	2008-05-02 00:59:05 UTC (rev 72966)
@@ -14,6 +14,18 @@
       
       <property name="configurationRegistry"><inject bean="CacheConfigurationRegistry"/></property>
       <property name="channelFactory"><inject bean="JChannelFactory"/></property>
+      
+      <!-- Aliases for cache names. Allows caches to be shared across different client types -->
+      <property name="configAliases">
+         <map keyClass="java.lang.String" valueClass="java.lang.String">
+            <!-- Use the HAPartition cache for ClusteredSSO caching -->
+            <entry>
+               <key>clustered-sso</key>
+               <value>ha-partition</value>
+            </entry>
+         </map>
+      </property>
+      
    </bean>
    
    <!-- Provides batching functionality for caches that don't want to interact with regular JTA Transactions -->
@@ -193,12 +205,14 @@
    </value>
    </entry>
    
-   <!-- Cache for clustered single sign on entries
-        FIXME Uncomment when the jbossweb-clustered-sso-beans.xml file is gone
-   <entry><key>clustered-sso</key>
+   <!-- 
+      Appropriate for the HAPartition-based services, e.g. DistributedState, 
+      HA-JNDI. Also valid for use by the JBossWeb ClusteredSingleSignOn valve.
+    -->
+   <entry><key>ha-partition</key>
    <value>
       
-      <bean name="ClusteredSSOCache" class="org.jboss.cache.config.Configuration">
+      <bean name="HAPartitionCache" class="org.jboss.cache.config.Configuration">
 
          <property name="runtimeConfig">
             <bean class="org.jboss.cache.config.RuntimeConfig">
@@ -208,13 +222,13 @@
          
          <property name="multiplexerStack">${jboss.default.jgroups.stack:udp}</property>
       
-         <property name="clusterName">${jboss.partition.name:DefaultPartition}-ClusteredSSOCache</property>
+         <property name="clusterName">${jboss.partition.name:DefaultPartition}-HAPartitionCache</property>
       
          <property name="nodeLockingSchemeString" class="java.lang.String">PESSIMISTIC</property>
          <property name="isolationLevelString" class="java.lang.String">REPEATABLE_READ</property>
-         <property name="cacheModeString">REPL_ASYNC</property>
+         <property name="cacheModeString">REPL_SYNC</property>
       
-         <property name="syncReplTimeout">20000</property>
+         <property name="syncReplTimeout">17500</property>
          <property name="lockAcquisitionTimeout">15000</property>
          <property name="stateRetrievalTimeout">60000</property>
       
@@ -224,8 +238,7 @@
          <property name="exposeManagementStatistics">true</property>
       </bean>
    </value>
-   </entry>  
-   -->
+   </entry>
 
          </map>
       </property>

Modified: trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-cache-configs.xml
===================================================================
--- trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-cache-configs.xml	2008-05-02 00:57:00 UTC (rev 72965)
+++ trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-cache-configs.xml	2008-05-02 00:59:05 UTC (rev 72966)
@@ -239,19 +239,20 @@
     </cache-config>
 
     <!-- 
-      | A config appropriate for credential caching by the 
-      | JBossWeb ClusteredSingleSignOn valve
+      | A config appropriate for the HAPartition-based services, e.g.
+      | DistributedState, HA-JNDI. Also valid for use by the JBossWeb 
+      | ClusteredSingleSignOn valve.
     -->
-    <cache-config name="clustered-sso">
+    <cache-config name="ha-partition">
 
         <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.BatchModeTransactionManagerLookup</attribute>
 
         <attribute name="NodeLockingScheme">PESSIMISTIC</attribute>
         <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
 
-        <attribute name="CacheMode">REPL_ASYNC</attribute>
+        <attribute name="CacheMode">REPL_SYNC</attribute>
 
-        <attribute name="ClusterName">${jboss.partition.name:DefaultPartition}-ClusteredSSOCache</attribute>
+        <attribute name="ClusterName">${jboss.partition.name:DefaultPartition}-HAPartitionCache</attribute>
         
         <!-- Use a UDP (multicast) based stack. Need JGroups flow control (FC)
              because we are using asynchronous replication.

Modified: trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-cache-manager-beans.xml
===================================================================
--- trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-cache-manager-beans.xml	2008-05-02 00:57:00 UTC (rev 72965)
+++ trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-cache-manager-beans.xml	2008-05-02 00:59:05 UTC (rev 72966)
@@ -19,6 +19,17 @@
       </property>
       
       <property name="channelFactory"><inject bean="JChannelFactory"/></property>
+      
+      <!-- Aliases for cache names. Allows caches to be shared across different client types -->
+      <property name="configAliases">
+         <map keyClass="java.lang.String" valueClass="java.lang.String">
+            <!-- Use the HAPartition cache for ClusteredSSO caching -->
+            <entry>
+               <key>clustered-sso</key>
+               <value>ha-partition</value>
+            </entry>
+         </map>
+      </property>
    </bean>
     
 </deployment>
\ No newline at end of file