[jboss-cvs] JBossAS SVN: r58555 - trunk/ejb3/src/resources
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 18 06:20:17 EST 2006
Author: bstansberry at jboss.com
Date: 2006-11-18 06:20:15 -0500 (Sat, 18 Nov 2006)
New Revision: 58555
Modified:
trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml
trunk/ejb3/src/resources/ejb3-entity-cache-beans.xml
Log:
Update configurations
Modified: trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml 2006-11-18 11:19:49 UTC (rev 58554)
+++ trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml 2006-11-18 11:20:15 UTC (rev 58555)
@@ -5,8 +5,15 @@
<!-- First we create a Configuration object for the cache -->
<bean name="EJB3SFSBCacheConfig"
class="org.jboss.cache.config.Configuration">
-
- <property name="multiplexerService">jgroups.mux:name=Multiplexer</property>
+
+ <!-- Externally injected services -->
+ <property name="runtimeConfig">
+ <bean name="EJB3SFSBCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+ <!--property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="transactionManager"/></property-->
+ <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}-SFSBCache</property>
@@ -33,6 +40,8 @@
<!-- Max number of milliseconds to wait for a lock acquisition -->
<property name="lockAcquisitionTimeout">16000</property>
+
+ <property name="exposeManagementStatistics">true</property>
<!-- Specific eviction policy configurations. This is LRU -->
<property name="evictionConfig">
@@ -66,6 +75,8 @@
<property name="individualCacheLoaderConfigs">
<list>
<bean name="EJB3SFSBFileCacheLoader" class="org.jboss.cache.loader.FileCacheLoaderConfig">
+ <!-- Temporary workaround to a bug in JBC 2.0.0.ALPHA1 -->
+ <property name="className">org.jboss.ejb3.cache.tree.SFSBFileCacheLoader</property>
<property name="location">${jboss.server.data.dir}${/}sfsb</property>
<property name="async">false</property>
<property name="fetchPersistentState">false</property>
@@ -79,14 +90,10 @@
<!-- Now we use the above configuration to construct the cache itself -->
<bean name="EJB3SFSBClusteredCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
- <depends>jgroups.mux:name=Multiplexer</depends>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=EJB3SFSBClusteredCache", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+
<property name="configuration"><inject bean="EJB3SFSBCacheConfig"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="cacheObjectName">jboss.cache:service=EJB3SFSBClusteredCache,partition=${jboss.partition.name:DefaultPartition}</property>
</bean>
Modified: trunk/ejb3/src/resources/ejb3-entity-cache-beans.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-entity-cache-beans.xml 2006-11-18 11:19:49 UTC (rev 58554)
+++ trunk/ejb3/src/resources/ejb3-entity-cache-beans.xml 2006-11-18 11:20:15 UTC (rev 58555)
@@ -5,15 +5,19 @@
<!-- First we create a Configuration object for the cache -->
<bean name="EJB3EntityCacheConfig"
class="org.jboss.cache.config.Configuration">
-
- <property name="multiplexerService">jgroups.mux:name=Multiplexer</property>
+
+ <!-- Externally injected services -->
+ <property name="runtimeConfig">
+ <bean name="EJB3EntityCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
+ <property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="transactionManager"/></property>
+ <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}-EntityCache</property>
- <!-- Configure the TransactionManager -->
- <property name="transactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</property>
-
<!--
Node locking level : SERIALIZABLE
REPEATABLE_READ (default)
@@ -33,15 +37,17 @@
initial state (ie. the contents of the cache) are retrieved from
existing members in a clustered environment
-->
- <property name="initialStateRetrievalTimeout">5000</property>
+ <property name="initialStateRetrievalTimeout">15000</property>
<!-- Number of milliseconds to wait until all responses for a
synchronous call have been received.
-->
- <property name="syncReplTimeout">10000</property>
+ <property name="syncReplTimeout">20000</property>
<!-- Max number of milliseconds to wait for a lock acquisition -->
<property name="lockAcquisitionTimeout">15000</property>
+
+ <property name="exposeManagementStatistics">true</property>
<!-- Specific eviction policy configurations. This is LRU -->
<property name="evictionConfig">
@@ -65,37 +71,14 @@
</bean>
</property>
- <property name="cacheLoaderConfig">
- <bean name="EJB3EntityCacheLoaderConfig"
- class="org.jboss.cache.config.CacheLoaderConfig">
-
- <property name="passivation">true</property>
- <property name="preload">/</property>
- <property name="shared">false</property>
- <property name="individualCacheLoaderConfigs">
- <list>
- <bean name="EJB3EntityFileCacheLoader" class="org.jboss.cache.loader.FileCacheLoaderConfig">
- <property name="location">${jboss.server.data.dir}${/}sfsb</property>
- <property name="async">false</property>
- <property name="fetchPersistentState">false</property>
- <property name="ignoreModifications">false</property>
- </bean>
- </list>
- </property>
- </bean>
- </property>
</bean>
<!-- Now we use the above configuration to construct the cache itself -->
<bean name="EJB3EntityCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
-
- <depends>jboss:service=Naming</depends>
- <depends>jboss:service=TransactionManager</depends>
- <depends>jgroups.mux:name=Multiplexer</depends>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=EJB3EntityTreeCache", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+
<property name="configuration"><inject bean="EJB3EntityCacheConfig"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="cacheObjectName">jboss.cache:service=EJB3EntityClusteredCache,partition=${jboss.partition.name:DefaultPartition}</property>
</bean>
More information about the jboss-cvs-commits
mailing list