[gatein-commits] gatein SVN: r2131 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/organization and 1 other directories.
Author: bdaw
Date: 2010-03-10 17:11:47 -0500 (Wed, 10 Mar 2010)
New Revision: 2131
Modified:
portal/trunk/pom.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
Log:
- use PicketLink IDM 1.1.1.GA
- uncomment cluster JBossCache configuration for IDM
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-03-10 21:39:05 UTC (rev 2130)
+++ portal/trunk/pom.xml 2010-03-10 22:11:47 UTC (rev 2131)
@@ -46,7 +46,7 @@
<org.gatein.common.version>2.0.0-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.0-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.1.0-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.1.0.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.1.1.GA</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-Beta09</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.0-CR03</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
---
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-10
21:39:05 UTC (rev 2130)
+++
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-10
22:11:47 UTC (rev 2131)
@@ -88,10 +88,10 @@
<value>war:/conf/organization/picketlink-idm/jboss-cache.xml</value>
</value-param>
- <!--<value-param profiles="cluster">
+ <value-param profiles="cluster">
<name>cacheConfig</name>
<value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value>
- </value-param>-->
+ </value-param>
</init-params>
</component>
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
===================================================================
---
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2010-03-10
21:39:05 UTC (rev 2130)
+++
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2010-03-10
22:11:47 UTC (rev 2131)
@@ -1,6 +1,6 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
- <clustering mode="replication"
clusterName="${jbosscache-cluster-name}">
+ <clustering mode="replication" clusterName="idm-cluster">
<stateRetrieval timeout="20000" fetchInMemoryState="false"
/>
<jgroupsConfig multiplexerStack="jcr.stack" />
<sync />