[jboss-svn-commits] JBoss Portal SVN: r5227 - in trunk: build/etc core/src/resources/portal-cms-sar/META-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 19 16:03:38 EDT 2006
Author: sohil.shah at jboss.com
Date: 2006-09-19 16:03:35 -0400 (Tue, 19 Sep 2006)
New Revision: 5227
Modified:
trunk/build/etc/clustered.properties
trunk/build/etc/single.properties
trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
Log:
fix for handling both single/cluster mode in the configuration
Modified: trunk/build/etc/clustered.properties
===================================================================
--- trunk/build/etc/clustered.properties 2006-09-19 17:37:18 UTC (rev 5226)
+++ trunk/build/etc/clustered.properties 2006-09-19 20:03:35 UTC (rev 5227)
@@ -8,3 +8,4 @@
portal.cache.config=replicated
portal.hibernate.cache.usage=transactional
cms.service.code=org.jboss.portal.cms.impl.jcr.ha.HAJCRCMS
+pm.cache.mode=INVALIDATION_ASYNC
Modified: trunk/build/etc/single.properties
===================================================================
--- trunk/build/etc/single.properties 2006-09-19 17:37:18 UTC (rev 5226)
+++ trunk/build/etc/single.properties 2006-09-19 20:03:35 UTC (rev 5227)
@@ -7,4 +7,5 @@
portal.web.postdistributable=
portal.cache.config=local
portal.hibernate.cache.usage=read-write
-cms.service.code=org.jboss.portal.cms.impl.jcr.JCRCMS
\ No newline at end of file
+cms.service.code=org.jboss.portal.cms.impl.jcr.JCRCMS
+pm.cache.mode=LOCAL
\ No newline at end of file
Modified: trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2006-09-19 17:37:18 UTC (rev 5226)
+++ trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2006-09-19 20:03:35 UTC (rev 5227)
@@ -10,8 +10,7 @@
</mbean-->
<!--
- @portal.single.xml.close@
-
+ //this is not needed anymore. this cache is redundant since jackrabbit is now clusterable
<mbean
code="org.jboss.portal.cms.impl.cache.CMSTreeCacheServiceImpl"
name="portal:service=CMSTreeCacheService"
@@ -31,7 +30,7 @@
</depends>
<attribute name="JNDIName">java:/portal/cms/CMSTreeCache</attribute>
</mbean>
-
+
<mbean
code="org.jboss.portal.cms.impl.interceptors.CacheInterceptor"
name="portal:service=Interceptor,type=Cms,name=Cache"
@@ -50,8 +49,6 @@
<depends-list-element>portal:service=Interceptor,type=Cms,name=Cache</depends-list-element>
</depends-list>
</mbean>
-
- @portal.single.xml.open@
-->
<mbean
@@ -65,9 +62,8 @@
<depends>portal:service=JAASLoginModule</depends>
<depends>portal:service=Hibernate,type=CMS</depends>
<!--
- @portal.single.xml.close@
+ //this is not needed anymore. this cache is redundant since jackrabbit is now clusterable
<depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends>
- @portal.single.xml.open@
-->
<attribute name="DoChecking">true</attribute>
<attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute>
@@ -182,7 +178,8 @@
<!--
| Uncomment in clustered mode : replicated cache for hibernate
- @portal.single.xml.close@
+
+ //this is not needed anymore. this cache is redundant since jackrabbit is now clusterable
<mbean
code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
name="portal:service=ProxyFactory,type=CMS">
@@ -220,8 +217,6 @@
<depends optional-attribute-name="Callback" proxy-type="attribute">portal:service=CMS</depends>
<depends optional-attribute-name="ProxyFactory">portal:service=ProxyFactory,type=CMS</depends>
</mbean>
-
- @portal.single.xml.open@
-->
<mbean
@@ -310,7 +305,7 @@
INVALIDATION_ASYNC
INVALIDATION_SYNC
-->
- <attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
+ <attribute name="CacheMode">@pm.cache.mode@</attribute>
<!--
Just used for async repl: use a replication queue
@@ -422,76 +417,41 @@
</attribute>
</mbean>
- <!-- TreeCache configuration for the clustered JackRabbit in-memory cache -->
+ <!--
+ | Uncomment in clustered mode : TreeCache configuration for the clustered JackRabbit in-memory cache
+ @portal.single.xml.close@
+
<mbean code="org.jboss.cache.TreeCache"
name="jackrabbit.inmemory.cache:service=TreeCache">
- <depends>jboss:service=Naming</depends>
+ <depends>jboss:service=Naming</depends>
<depends>jboss:service=TransactionManager</depends>
- <!--
- Configure the TransactionManager
- -->
- <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
-
- <!--
- Node locking scheme:
- OPTIMISTIC
- PESSIMISTIC (default)
- using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
- -->
- <!--attribute name="NodeLockingScheme">OPTIMISTIC</attribute-->
+ <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
- <!--
- Isolation level : SERIALIZABLE
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED
- NONE
- -->
+
<attribute name="IsolationLevel">NONE</attribute>
- <!--
- Valid modes are LOCAL
- REPL_ASYNC
- REPL_SYNC
- INVALIDATION_ASYNC
- INVALIDATION_SYNC
- -->
+
<attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
- <!--
- Just used for async repl: use a replication queue
- -->
+
<attribute name="UseReplQueue">false</attribute>
- <!--
- Replication interval for replication queue (in ms)
- -->
+
<attribute name="ReplQueueInterval">0</attribute>
- <!--
- Max number of elements which trigger replication
- -->
+
<attribute name="ReplQueueMaxElements">0</attribute>
- <!-- Name of cluster. Needs to be the same for all clusters, in order
- to find each other
- -->
+
<attribute name="ClusterName">JackRabbitInternalCache</attribute>
- <!-- JGroups protocol stack properties. Can also be a URL,
- e.g. file:/home/bela/default.xml
- <attribute name="ClusterProperties"></attribute>
- -->
+
<attribute name="ClusterConfig">
- <config>
- <!-- UDP: if you have a multihomed machine,
- set the bind_addr attribute to the appropriate NIC IP address -->
- <!-- UDP: On Windows machines, because of the media sense feature
- being broken with multicast (even after disabling media sense)
- set the loopback attribute to true -->
+ <config>
<UDP mcast_addr="228.1.2.3" mcast_port="48866"
ip_ttl="64" ip_mcast="true"
receive_on_all_interfaces="true"
@@ -500,8 +460,7 @@
loopback="false"/>
<PING timeout="2000" num_initial_members="3"
up_thread="false" down_thread="false"/>
- <MERGE2 min_interval="10000" max_interval="20000"/>
- <!-- <FD shun="true" up_thread="true" down_thread="true" />-->
+ <MERGE2 min_interval="10000" max_interval="20000"/>
<FD_SOCK/>
<VERIFY_SUSPECT timeout="1500"
up_thread="false" down_thread="false"/>
@@ -519,36 +478,19 @@
</config>
</attribute>
- <!--
- Whether or not to fetch state on joining a cluster
- NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
- -->
<attribute name="FetchInMemoryState">false</attribute>
- <!--
- The max amount of time (in milliseconds) we wait until the
- initial state (ie. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
<attribute name="InitialStateRetrievalTimeout">20000</attribute>
- <!--
- Number of milliseconds to wait until all responses for a
- synchronous call have been received.
- -->
<attribute name="SyncReplTimeout">20000</attribute>
-
- <!-- Max number of milliseconds to wait for a lock acquisition -->
+
<attribute name="LockAcquisitionTimeout">15000</attribute>
-
- <!-- Name of the eviction policy class. -->
+
<attribute name="EvictionPolicyClass"></attribute>
-
- <!--
- Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
- class loader, e.g., inside an application server. Default is "false".
- -->
+
<attribute name="UseRegionBasedMarshalling">false</attribute>
- </mbean>
+ </mbean>
+ @portal.single.xml.open@
+ -->
</server>
More information about the jboss-svn-commits
mailing list