[jboss-cvs] JBossAS SVN: r58589 - trunk/tomcat/src/resources

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

Author: bstansberry at jboss.com
Date: 2006-11-18 06:44:37 -0500 (Sat, 18 Nov 2006)
New Revision: 58589

Modified:
   trunk/tomcat/src/resources/tc6-cluster-beans.xml
Log:
Update config

Modified: trunk/tomcat/src/resources/tc6-cluster-beans.xml
===================================================================
--- trunk/tomcat/src/resources/tc6-cluster-beans.xml	2006-11-18 11:44:17 UTC (rev 58588)
+++ trunk/tomcat/src/resources/tc6-cluster-beans.xml	2006-11-18 11:44:37 UTC (rev 58589)
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-   The bootstrap of the server
--->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
    <!-- First we create a Configuration object for the cache -->
    <bean name="TomcatClusteringCacheConfig" class="org.jboss.cache.config.Configuration">
-   
-      <property name="multiplexerService">jgroups.mux:name=Multiplexer</property>
+      
+      <!-- Externally injected services -->  
+      <property name="runtimeConfig">
+         <bean name="TomcatClusteringCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+            <property name="muxChannelFactory"><inject bean="jgroups.mux:name=Multiplexer"/></property>
+         </bean>
+      </property>
+      
       <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
    
       <property name="clusterName">${jboss.partition.name:DefaultPartition}-TomcatCache</property>
@@ -24,6 +27,8 @@
    
       <property name="useRegionBasedMarshalling">false</property>
       <property name="inactiveOnStartup">false</property>
+        
+      <property name="exposeManagementStatistics">true</property>
    
       <property name="buddyReplicationConfig">
       	<bean name="TomcatClusteringBuddyReplicationConfig" 
@@ -45,7 +50,7 @@
       		</property>
       	</bean>
       </property>
-      
+      <!--
       <property name="cacheLoaderConfig">
       	<bean name="TomcatClusteringCacheLoaderConfig" 
       		class="org.jboss.cache.config.CacheLoaderConfig">
@@ -55,7 +60,7 @@
                 <property name="individualCacheLoaderConfigs">
                 	<list>
                 		<bean name="TomcatClusteringFileCacheLoader" class="org.jboss.cache.loader.FileCacheLoaderConfig">
-                			<property name="location">${java.io.tempdir}/tomcat-cluster</property>
+                			<property name="location">${jboss.server.data.dir}${/}tomcat-cluster</property>
                     		<property name="async">true</property>
                     		<property name="fetchPersistentState">true</property>
                     		<property name="ignoreModifications">false</property>
@@ -64,20 +69,17 @@
                 </property>
       	</bean>
       </property>
-      
+      -->
    </bean>
     
    <!-- Now we use the above configuration to construct the cache itself -->
    <bean name="TomcatClusteringCache" class="org.jboss.cache.pojo.jmx.PojoCacheJmxWrapper">
-      <!--annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.pojocache:service=TomcatClusterCache,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.cache.pojo.jmx.PojoCacheJmxWrapperMBean.class)</annotation-->
       
-      <depends>jboss:service=Naming</depends>
-      <depends>jgroups.mux:name=Multiplexer</depends>
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=TomcatClusteringCache", exposedInterface=org.jboss.cache.pojo.jmx.PojoCacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
       
       <property name="configuration"><inject bean="TomcatClusteringCacheConfig"/></property>
-      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-      <property name="pojoCacheObjectName">jboss.pojocache:service=TomcatClusterCache,partition=${jboss.partition.name:DefaultPartition}</property>
-        
+      <property name="registerPlainCache">true</property>
+      
    </bean>
 	
 </deployment>
\ No newline at end of file