[jboss-cvs] JBossAS SVN: r76358 - trunk/cluster/src/etc.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jul 29 05:58:47 EDT 2008


Author: adrian at jboss.org
Date: 2008-07-29 05:58:47 -0400 (Tue, 29 Jul 2008)
New Revision: 76358

Added:
   trunk/cluster/src/etc/jboss-cache-manager-jboss-beans.xml
Removed:
   trunk/cluster/src/etc/jboss-cache-manager-beans.xml
Log:
[JBAS-5803] beans.xml -> jboss-beans.xml

Deleted: trunk/cluster/src/etc/jboss-cache-manager-beans.xml
===================================================================
--- trunk/cluster/src/etc/jboss-cache-manager-beans.xml	2008-07-29 09:58:10 UTC (rev 76357)
+++ trunk/cluster/src/etc/jboss-cache-manager-beans.xml	2008-07-29 09:58:47 UTC (rev 76358)
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- Factory/registry for JBoss Cache and PojoCache instances used in the AS -->
-   <bean name="CacheManager" class="org.jboss.ha.cachemanager.CacheManager">
-
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=CacheManager",                                          exposedInterface=org.jboss.ha.cachemanager.CacheManagerMBean.class, registerDirectly=true)</annotation>
-
-      <!-- This doesn't seem to work, so the service binds itself for now
-      <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="java:CacheManager")</annotation>
-      -->
-      <property name="jndiName">java:CacheManager</property>
-      
-      <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 -->
-   <bean name="StandardJBossCacheBatchManager" class="org.jboss.cache.transaction.BatchModeTransactionManager"/>
-   
-   <!-- 
-     | Registry of named JBoss Cache configurations. Users of the CacheManager
-     | request a cache with a particular configuration by providing the name
-     | of one of these configurations.
-   -->
-   <bean name="CacheConfigurationRegistry" class="org.jboss.ha.cachemanager.DependencyInjectedConfigurationRegistry">
-   
-      <!-- The configurations. A Map<String name, Configuration config> -->
-      <property name="newConfigurations">
-        <map keyClass="java.lang.String" valueClass="org.jboss.cache.config.Configuration">
-   
-   <!-- The standard configurations follow.  You can add your own and/or edit these. -->   
-      
-   <!-- Standard cache used for web sessions and EBJ3 SFSBs -->
-   <entry><key>standard-session-cache</key>
-   <value>      
-      <bean name="StandardSessionCacheConfig" class="org.jboss.cache.config.Configuration">
-
-         <property name="runtimeConfig">
-            <bean class="org.jboss.cache.config.RuntimeConfig">
-               <property name="transactionManager"><inject bean="StandardJBossCacheBatchManager"/></property>
-            </bean>
-         </property>
-         
-         <property name="multiplexerStack">${jboss.default.jgroups.stack:udp}</property>
-      
-         <property name="clusterName">${jboss.partition.name:DefaultPartition}-SessionCache</property>
-      
-         <property name="nodeLockingScheme">PESSIMISTIC</property>
-         <property name="isolationLevel">REPEATABLE_READ</property>
-         <property name="cacheMode">REPL_ASYNC</property>
-      
-         <property name="syncReplTimeout">17500</property>
-         <property name="lockAcquisitionTimeout">15000</property>
-         <property name="stateRetrievalTimeout">60000</property>
-      
-         <property name="useRegionBasedMarshalling">false</property>
-         <property name="inactiveOnStartup">false</property>
-           
-         <property name="exposeManagementStatistics">true</property>
-      
-         <property name="buddyReplicationConfig">
-            <bean class="org.jboss.cache.config.BuddyReplicationConfig">
-               
-               <property name="enabled">false</property>
-               <property name="buddyPoolName">default</property>
-               <property name="buddyCommunicationTimeout">17500</property>
-
-               <property name="autoDataGravitation">false</property>
-               <property name="dataGravitationRemoveOnFind">true</property>
-               <property name="dataGravitationSearchBackupTrees">true</property>
-               
-               <property name="buddyLocatorConfig">
-                  <bean class="org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig">
-                     <property name="numBuddies">1</property>
-                     <property name="ignoreColocatedBuddies">true</property>
-                   </bean>
-               </property>
-            </bean>
-         </property>
-         <property name="cacheLoaderConfig">
-            <bean class="org.jboss.cache.config.CacheLoaderConfig">
-                  <property name="passivation">true</property>
-                   <property name="shared">false</property>
-                   <property name="individualCacheLoaderConfigs">
-                     <list>
-                        <bean class="org.jboss.cache.loader.FileCacheLoaderConfig">
-                           <property name="location">${jboss.server.data.dir}${/}sessions</property>
-                           <property name="async">false</property>
-                           <property name="fetchPersistentState">true</property>
-                           <property name="ignoreModifications">false</property>
-                           <property name="checkCharacterPortability">false</property>
-                        </bean>
-                     </list>
-                   </property>
-            </bean>
-         </property>
-      </bean>      
-   </value>
-   </entry>
-   
-   <!-- Appropriate for web sessions with FIELD granularity -->
-   <entry><key>field-granularity-session-cache</key>
-   <value>
-      
-      <bean name="FieldSessionCacheConfig" class="org.jboss.cache.config.Configuration">
-      
-         <property name="runtimeConfig">
-            <bean class="org.jboss.cache.config.RuntimeConfig">
-               <property name="transactionManager"><inject bean="StandardJBossCacheBatchManager"/></property>
-            </bean>
-         </property>
-         
-         <property name="multiplexerStack">${jboss.default.jgroups.stack:udp}</property>
-      
-         <property name="clusterName">${jboss.partition.name:DefaultPartition}-FieldSessionCache</property>
-      
-         <property name="nodeLockingScheme">PESSIMISTIC</property>
-         <property name="isolationLevel">REPEATABLE_READ</property>
-         <property name="cacheMode">REPL_ASYNC</property>
-      
-         <property name="syncReplTimeout">17500</property>
-         <property name="lockAcquisitionTimeout">15000</property>
-         <property name="stateRetrievalTimeout">60000</property>
-          
-         <!-- Field granularity requires region-based marshalling -->
-         <property name="useRegionBasedMarshalling">true</property>
-         <property name="inactiveOnStartup">true</property>
-           
-         <property name="exposeManagementStatistics">true</property>
-      
-         <property name="buddyReplicationConfig">
-            <bean class="org.jboss.cache.config.BuddyReplicationConfig">
-               
-               <property name="enabled">false</property>
-               <property name="buddyPoolName">default</property>
-               <property name="buddyCommunicationTimeout">17500</property>
-
-               <property name="autoDataGravitation">false</property>
-               <property name="dataGravitationRemoveOnFind">true</property>
-               <property name="dataGravitationSearchBackupTrees">true</property>
-               
-               <property name="buddyLocatorConfig">
-                  <bean class="org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig">
-                     <property name="numBuddies">1</property>
-                     <property name="ignoreColocatedBuddies">true</property>
-                   </bean>
-               </property>
-            </bean>
-         </property>
-         <property name="cacheLoaderConfig">
-            <bean class="org.jboss.cache.config.CacheLoaderConfig">
-                  <property name="passivation">true</property>
-                   <property name="shared">false</property>
-                   <property name="individualCacheLoaderConfigs">
-                     <list>
-                        <bean class="org.jboss.cache.loader.FileCacheLoaderConfig">
-                           <property name="location">${jboss.server.data.dir}${/}field-session</property>
-                           <property name="async">false</property>
-                           <property name="fetchPersistentState">true</property>
-                           <property name="ignoreModifications">false</property>
-                           <property name="checkCharacterPortability">false</property>
-                        </bean>
-                     </list>
-                   </property>
-            </bean>
-         </property>
-        
-         <!-- FIELD granularity webapps use JBoss Cache eviction -->
-         <property name="evictionConfig">
-             <bean class="org.jboss.cache.config.EvictionConfig">
-               <property name="defaultEvictionPolicyClass">org.jboss.cache.eviction.NullEvictionPolicy</property>
-               <property name="wakeupIntervalSeconds">5</property>
-               <property name="evictionRegionConfigs">
-                  <list>
-                     <!-- Default region will never timeout. Do not change this -->
-                     <bean class="org.jboss.cache.config.EvictionRegionConfig">
-                        <property name="regionName">/_default_</property>
-                        <property name="evictionPolicyConfig">
-                           <bean class="org.jboss.cache.eviction.NullEvictionPolicyConfig"/>
-                        </property>
-                     </bean>
-                     <!-- JBossWeb integration code may programatically create other
-                          regions as webapps are deployed -->
-                  </list>
-            </property>
-            </bean>
-         </property>
-      </bean>
-   </value>
-   </entry>
-   
-   <!-- 
-      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="HAPartitionCache" class="org.jboss.cache.config.Configuration">
-
-         <property name="runtimeConfig">
-            <bean class="org.jboss.cache.config.RuntimeConfig">
-               <property name="transactionManager"><inject bean="StandardJBossCacheBatchManager"/></property>
-            </bean>
-         </property>
-         
-         <property name="multiplexerStack">${jboss.default.jgroups.stack:udp}</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_SYNC</property>
-      
-         <property name="syncReplTimeout">17500</property>
-         <property name="lockAcquisitionTimeout">15000</property>
-         <property name="stateRetrievalTimeout">60000</property>
-      
-         <property name="useRegionBasedMarshalling">false</property>
-         <property name="inactiveOnStartup">false</property>
-           
-         <property name="exposeManagementStatistics">true</property>
-      </bean>
-   </value>
-   </entry>
-
-         </map>
-      </property>
-   </bean>
-    
-</deployment>
\ No newline at end of file

Copied: trunk/cluster/src/etc/jboss-cache-manager-jboss-beans.xml (from rev 76357, trunk/cluster/src/etc/jboss-cache-manager-beans.xml)
===================================================================
--- trunk/cluster/src/etc/jboss-cache-manager-jboss-beans.xml	                        (rev 0)
+++ trunk/cluster/src/etc/jboss-cache-manager-jboss-beans.xml	2008-07-29 09:58:47 UTC (rev 76358)
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- Factory/registry for JBoss Cache and PojoCache instances used in the AS -->
+   <bean name="CacheManager" class="org.jboss.ha.cachemanager.CacheManager">
+
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=CacheManager",                                          exposedInterface=org.jboss.ha.cachemanager.CacheManagerMBean.class, registerDirectly=true)</annotation>
+
+      <!-- This doesn't seem to work, so the service binds itself for now
+      <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="java:CacheManager")</annotation>
+      -->
+      <property name="jndiName">java:CacheManager</property>
+      
+      <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 -->
+   <bean name="StandardJBossCacheBatchManager" class="org.jboss.cache.transaction.BatchModeTransactionManager"/>
+   
+   <!-- 
+     | Registry of named JBoss Cache configurations. Users of the CacheManager
+     | request a cache with a particular configuration by providing the name
+     | of one of these configurations.
+   -->
+   <bean name="CacheConfigurationRegistry" class="org.jboss.ha.cachemanager.DependencyInjectedConfigurationRegistry">
+   
+      <!-- The configurations. A Map<String name, Configuration config> -->
+      <property name="newConfigurations">
+        <map keyClass="java.lang.String" valueClass="org.jboss.cache.config.Configuration">
+   
+   <!-- The standard configurations follow.  You can add your own and/or edit these. -->   
+      
+   <!-- Standard cache used for web sessions and EBJ3 SFSBs -->
+   <entry><key>standard-session-cache</key>
+   <value>      
+      <bean name="StandardSessionCacheConfig" class="org.jboss.cache.config.Configuration">
+
+         <property name="runtimeConfig">
+            <bean class="org.jboss.cache.config.RuntimeConfig">
+               <property name="transactionManager"><inject bean="StandardJBossCacheBatchManager"/></property>
+            </bean>
+         </property>
+         
+         <property name="multiplexerStack">${jboss.default.jgroups.stack:udp}</property>
+      
+         <property name="clusterName">${jboss.partition.name:DefaultPartition}-SessionCache</property>
+      
+         <property name="nodeLockingScheme">PESSIMISTIC</property>
+         <property name="isolationLevel">REPEATABLE_READ</property>
+         <property name="cacheMode">REPL_ASYNC</property>
+      
+         <property name="syncReplTimeout">17500</property>
+         <property name="lockAcquisitionTimeout">15000</property>
+         <property name="stateRetrievalTimeout">60000</property>
+      
+         <property name="useRegionBasedMarshalling">false</property>
+         <property name="inactiveOnStartup">false</property>
+           
+         <property name="exposeManagementStatistics">true</property>
+      
+         <property name="buddyReplicationConfig">
+            <bean class="org.jboss.cache.config.BuddyReplicationConfig">
+               
+               <property name="enabled">false</property>
+               <property name="buddyPoolName">default</property>
+               <property name="buddyCommunicationTimeout">17500</property>
+
+               <property name="autoDataGravitation">false</property>
+               <property name="dataGravitationRemoveOnFind">true</property>
+               <property name="dataGravitationSearchBackupTrees">true</property>
+               
+               <property name="buddyLocatorConfig">
+                  <bean class="org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig">
+                     <property name="numBuddies">1</property>
+                     <property name="ignoreColocatedBuddies">true</property>
+                   </bean>
+               </property>
+            </bean>
+         </property>
+         <property name="cacheLoaderConfig">
+            <bean class="org.jboss.cache.config.CacheLoaderConfig">
+                  <property name="passivation">true</property>
+                   <property name="shared">false</property>
+                   <property name="individualCacheLoaderConfigs">
+                     <list>
+                        <bean class="org.jboss.cache.loader.FileCacheLoaderConfig">
+                           <property name="location">${jboss.server.data.dir}${/}sessions</property>
+                           <property name="async">false</property>
+                           <property name="fetchPersistentState">true</property>
+                           <property name="ignoreModifications">false</property>
+                           <property name="checkCharacterPortability">false</property>
+                        </bean>
+                     </list>
+                   </property>
+            </bean>
+         </property>
+      </bean>      
+   </value>
+   </entry>
+   
+   <!-- Appropriate for web sessions with FIELD granularity -->
+   <entry><key>field-granularity-session-cache</key>
+   <value>
+      
+      <bean name="FieldSessionCacheConfig" class="org.jboss.cache.config.Configuration">
+      
+         <property name="runtimeConfig">
+            <bean class="org.jboss.cache.config.RuntimeConfig">
+               <property name="transactionManager"><inject bean="StandardJBossCacheBatchManager"/></property>
+            </bean>
+         </property>
+         
+         <property name="multiplexerStack">${jboss.default.jgroups.stack:udp}</property>
+      
+         <property name="clusterName">${jboss.partition.name:DefaultPartition}-FieldSessionCache</property>
+      
+         <property name="nodeLockingScheme">PESSIMISTIC</property>
+         <property name="isolationLevel">REPEATABLE_READ</property>
+         <property name="cacheMode">REPL_ASYNC</property>
+      
+         <property name="syncReplTimeout">17500</property>
+         <property name="lockAcquisitionTimeout">15000</property>
+         <property name="stateRetrievalTimeout">60000</property>
+          
+         <!-- Field granularity requires region-based marshalling -->
+         <property name="useRegionBasedMarshalling">true</property>
+         <property name="inactiveOnStartup">true</property>
+           
+         <property name="exposeManagementStatistics">true</property>
+      
+         <property name="buddyReplicationConfig">
+            <bean class="org.jboss.cache.config.BuddyReplicationConfig">
+               
+               <property name="enabled">false</property>
+               <property name="buddyPoolName">default</property>
+               <property name="buddyCommunicationTimeout">17500</property>
+
+               <property name="autoDataGravitation">false</property>
+               <property name="dataGravitationRemoveOnFind">true</property>
+               <property name="dataGravitationSearchBackupTrees">true</property>
+               
+               <property name="buddyLocatorConfig">
+                  <bean class="org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig">
+                     <property name="numBuddies">1</property>
+                     <property name="ignoreColocatedBuddies">true</property>
+                   </bean>
+               </property>
+            </bean>
+         </property>
+         <property name="cacheLoaderConfig">
+            <bean class="org.jboss.cache.config.CacheLoaderConfig">
+                  <property name="passivation">true</property>
+                   <property name="shared">false</property>
+                   <property name="individualCacheLoaderConfigs">
+                     <list>
+                        <bean class="org.jboss.cache.loader.FileCacheLoaderConfig">
+                           <property name="location">${jboss.server.data.dir}${/}field-session</property>
+                           <property name="async">false</property>
+                           <property name="fetchPersistentState">true</property>
+                           <property name="ignoreModifications">false</property>
+                           <property name="checkCharacterPortability">false</property>
+                        </bean>
+                     </list>
+                   </property>
+            </bean>
+         </property>
+        
+         <!-- FIELD granularity webapps use JBoss Cache eviction -->
+         <property name="evictionConfig">
+             <bean class="org.jboss.cache.config.EvictionConfig">
+               <property name="defaultEvictionPolicyClass">org.jboss.cache.eviction.NullEvictionPolicy</property>
+               <property name="wakeupIntervalSeconds">5</property>
+               <property name="evictionRegionConfigs">
+                  <list>
+                     <!-- Default region will never timeout. Do not change this -->
+                     <bean class="org.jboss.cache.config.EvictionRegionConfig">
+                        <property name="regionName">/_default_</property>
+                        <property name="evictionPolicyConfig">
+                           <bean class="org.jboss.cache.eviction.NullEvictionPolicyConfig"/>
+                        </property>
+                     </bean>
+                     <!-- JBossWeb integration code may programatically create other
+                          regions as webapps are deployed -->
+                  </list>
+            </property>
+            </bean>
+         </property>
+      </bean>
+   </value>
+   </entry>
+   
+   <!-- 
+      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="HAPartitionCache" class="org.jboss.cache.config.Configuration">
+
+         <property name="runtimeConfig">
+            <bean class="org.jboss.cache.config.RuntimeConfig">
+               <property name="transactionManager"><inject bean="StandardJBossCacheBatchManager"/></property>
+            </bean>
+         </property>
+         
+         <property name="multiplexerStack">${jboss.default.jgroups.stack:udp}</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_SYNC</property>
+      
+         <property name="syncReplTimeout">17500</property>
+         <property name="lockAcquisitionTimeout">15000</property>
+         <property name="stateRetrievalTimeout">60000</property>
+      
+         <property name="useRegionBasedMarshalling">false</property>
+         <property name="inactiveOnStartup">false</property>
+           
+         <property name="exposeManagementStatistics">true</property>
+      </bean>
+   </value>
+   </entry>
+
+         </map>
+      </property>
+   </bean>
+    
+</deployment>
\ No newline at end of file




More information about the jboss-cvs-commits mailing list