gatein SVN: r2056 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-09 08:24:09 -0500 (Tue, 09 Mar 2010)
New Revision: 2056
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java
Log:
remove unused parameters
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2010-03-09 11:32:19 UTC (rev 2055)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationData.java 2010-03-09 13:24:09 UTC (rev 2056)
@@ -36,8 +36,6 @@
public NavigationData(
String ownerType,
String ownerId,
- String creator,
- String modifier,
Integer priority,
List<NavigationNodeData> children)
{
14 years, 9 months
gatein SVN: r2055 - portal/trunk/server/jboss/patch-ear/src/main/jboss/bin.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-09 06:32:19 -0500 (Tue, 09 Mar 2010)
New Revision: 2055
Modified:
portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf
portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat
Log:
Hopefully better defaults...
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf 2010-03-09 10:16:32 UTC (rev 2054)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf 2010-03-09 11:32:19 UTC (rev 2055)
@@ -42,7 +42,7 @@
# Specify options to pass to the Java VM.
#
if [ "x$JAVA_OPTS" = "x" ]; then
- JAVA_OPTS="-Xms512m -Xmx768m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
+ JAVA_OPTS="-Xms512m -Xmx1024m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
fi
# Sample JPDA settings for remote socket debugging
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat 2010-03-09 10:16:32 UTC (rev 2054)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat 2010-03-09 11:32:19 UTC (rev 2055)
@@ -40,7 +40,7 @@
rem #
rem # JVM memory allocation pool parameters - modify as appropriate.
-set "JAVA_OPTS=-Xms512M -Xmx768M -XX:MaxPermSize=256M"
+set "JAVA_OPTS=-Xms512M -Xmx1024M -XX:MaxPermSize=256M"
rem # Reduce the RMI GCs to once per hour for Sun JVMs.
set "JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
14 years, 9 months
gatein SVN: r2054 - in portal/trunk/server: tomcat/patch/src/main/tomcat/bin and 1 other directory.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-03-09 05:16:32 -0500 (Tue, 09 Mar 2010)
New Revision: 2054
Removed:
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/key.txt
Modified:
portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf
portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat
Log:
GTNPORTAL-708: a config directory set to ${server-configuration}/conf/gatein; removed default key.txt for tomcat
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf 2010-03-09 09:56:55 UTC (rev 2053)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf 2010-03-09 10:16:32 UTC (rev 2054)
@@ -50,3 +50,6 @@
# Sample JPDA settings for shared memory debugging
#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
+
+# GateIn configuration directory
+JAVA_OPTS="$JAVA_OPTS -Dexo.conf.dir.name=gatein"
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat 2010-03-09 09:56:55 UTC (rev 2053)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat 2010-03-09 10:16:32 UTC (rev 2054)
@@ -55,3 +55,6 @@
rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n"
:JAVA_OPTS_SET
+
+rem # GateIn configuration directory
+set "JAVA_OPTS=%JAVA_OPTS% -Dexo.conf.dir.name=gatein"
Deleted: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/key.txt
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/key.txt 2010-03-09 09:56:55 UTC (rev 2053)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/key.txt 2010-03-09 10:16:32 UTC (rev 2054)
@@ -1 +0,0 @@
-GYdJ1j54n49aTjZjTEy4+eZfoZ8IT6h7xQj7u45ogoI=
14 years, 9 months
gatein SVN: r2053 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-03-09 04:56:55 -0500 (Tue, 09 Mar 2010)
New Revision: 2053
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_008.html
Log:
Update "Test_POR_09_008.html"
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_008.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_008.html 2010-03-09 09:33:35 UTC (rev 2052)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_008.html 2010-03-09 09:56:55 UTC (rev 2053)
@@ -147,11 +147,6 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>link=Platform</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Administrators</td>
<td></td>
@@ -347,18 +342,28 @@
<td>1,1</td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Test_POR_09_008</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Test_POR_09_008</td>
+ <td>1,1</td>
+</tr>
+<tr>
<td>echo</td>
<td>--Delete portal with name is upper case--</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@id='UISiteManagement']/table[3]/tbody/tr/td[3]/a[4]</td>
+ <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
- <td>xpath=//div[@id='UISiteManagement']/table[3]/tbody/tr/td[3]/a[4]</td>
+ <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td>
<td></td>
</tr>
<tr>
14 years, 9 months
gatein SVN: r2052 - portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: arthurpeltier
Date: 2010-03-09 04:33:35 -0500 (Tue, 09 Mar 2010)
New Revision: 2052
Modified:
portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java
Log:
GTNPORTAL-741 : * Add "VerifyText" action to SeleniumTestCaseGenerator.java
Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-03-09 09:31:12 UTC (rev 2051)
+++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-03-09 09:33:35 UTC (rev 2052)
@@ -254,6 +254,13 @@
sb.append("(selenium.isTextPresent(\"");
sb.append(param2);
sb.append("\"));\n");
+ } else if (param1.equals("verifyText")) {
+ sb.append("TestCase.assertTrue");
+ sb.append("(selenium.getText(\"");
+ sb.append(param2);
+ sb.append("\").equals(\"");
+ sb.append(param3);
+ sb.append("\"));\n");
} else if (param1.equals("verifyTitle")) {
sb.append("TestCase.assertEquals(\"");
sb.append(param2);
14 years, 9 months
gatein SVN: r2051 - portal/trunk/testsuite.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-03-09 04:31:12 -0500 (Tue, 09 Mar 2010)
New Revision: 2051
Modified:
portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods
Log:
Update "GateIn_v3.0_MainFucntions_TestDefinition.ods"
Modified: portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods
===================================================================
(Binary files differ)
14 years, 9 months
gatein SVN: r2050 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-03-09 04:01:14 -0500 (Tue, 09 Mar 2010)
New Revision: 2050
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_043.html
Log:
Update "Test_POR_14_043.html.html"
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_043.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_043.html 2010-03-09 08:01:28 UTC (rev 2049)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_043.html 2010-03-09 09:01:14 UTC (rev 2050)
@@ -18,11 +18,6 @@
</tr>
<tr>
<td>echo</td>
- <td>-New Account-</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
<td>--Register New Account-</td>
<td></td>
</tr>
@@ -98,17 +93,17 @@
</tr>
<tr>
<td>clickAt</td>
- <td>//div[@id='UIPortalLoginFormAction']//a</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td>
<td></td>
</tr>
<tr>
<td>echo</td>
- <td>-GroupManagement-</td>
+ <td>--GroupManagement--</td>
<td></td>
</tr>
<tr>
<td>echo</td>
- <td>-Select User and group managent in menu</td>
+ <td>--Select User and group managent in menu--</td>
<td></td>
</tr>
<tr>
@@ -133,17 +128,17 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td>
+ <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td>
+ <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td>
<td>1,1</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td>
+ <td>xpath=//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
@@ -178,17 +173,17 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td>
+ <td>xpath=//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>//td[2]/a</td>
+ <td>xpath=//td[2]/a</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td>
+ <td>xpath=//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -198,17 +193,17 @@
</tr>
<tr>
<td>echo</td>
- <td>-Click add button-</td>
+ <td>--Click add button--</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td>
+ <td>xpath=//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td>
+ <td>xpath=//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td>
<td></td>
</tr>
<tr>
@@ -223,7 +218,7 @@
</tr>
<tr>
<td>echo</td>
- <td>-Page Management-</td>
+ <td>--Page Management--</td>
<td></td>
</tr>
<tr>
@@ -247,6 +242,11 @@
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Add new page--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
@@ -268,7 +268,7 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//option[@value='portal']</td>
+ <td>xpath=//option[@value='portal']</td>
<td></td>
</tr>
<tr>
@@ -358,7 +358,7 @@
</tr>
<tr>
<td>echo</td>
- <td>-- Choose Page Selector</td>
+ <td>-- Choose Page Selector--</td>
<td></td>
</tr>
<tr>
@@ -367,7 +367,7 @@
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAt</td>
<td>link=Search and Select Page</td>
<td></td>
</tr>
@@ -377,18 +377,18 @@
<td></td>
</tr>
<tr>
- <td>click</td>
+ <td>clickAt</td>
<td>link=Search and Select Page</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//img[contains(@onclick,'por_14_043')]</td>
+ <td>xpath=//img[contains(@onclick,'por_14_043')]</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>//img[contains(@onclick,'por_14_043')]</td>
+ <td>xpath=//img[contains(@onclick,'por_14_043')]</td>
<td></td>
</tr>
<tr>
@@ -402,11 +402,21 @@
<td>1,1</td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Sign out--</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Sign out</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Sign In with new accout--</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign in</td>
<td></td>
@@ -423,10 +433,15 @@
</tr>
<tr>
<td>clickAt</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>--Sign out--</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
@@ -437,7 +452,12 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>echo</td>
+ <td>--Sign In by root--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>link=Sign in</td>
<td></td>
</tr>
@@ -452,6 +472,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign in</td>
<td></td>
@@ -472,8 +497,13 @@
<td>gtn</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
- <td>//div[@id='UIPortalLoginFormAction']//a</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td>
<td></td>
</tr>
<tr>
@@ -518,7 +548,7 @@
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -593,12 +623,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//img[@alt='DeleteUser']</td>
+ <td>xpath=//img[@alt='DeleteUser']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>//img[@alt='DeleteUser']</td>
+ <td>xpath=//img[@alt='DeleteUser']</td>
<td></td>
</tr>
<tr>
14 years, 9 months
gatein SVN: r2049 - in portal/trunk: component/identity/src/main/java/conf/portal and 7 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2010-03-09 03:01:28 -0500 (Tue, 09 Mar 2010)
New Revision: 2049
Added:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheServiceImpl.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
Removed:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml
Modified:
portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
portal/trunk/component/identity/src/test/java/conf/portal/idm-configuration.xml
portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml
portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml
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/examples/picketlink-idm-ldap-acme-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml
Log:
- use PLIDM realm templating
- Simple service for identity cache invalidation
Modified: portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml
===================================================================
--- portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,7 +25,7 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>PortalRealm</id>
+ <id>idm_realm</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
Added: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java (rev 0)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheService.java 2010-03-09 08:01:28 UTC (rev 2049)
@@ -0,0 +1,42 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2010, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.exoplatform.services.organization.idm;
+
+import org.picketlink.idm.cache.APICacheProvider;
+
+
+/*
+ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
+ */
+public interface IdentityCacheService
+{
+
+ public void register(APICacheProvider cacheProvider);
+
+ public void invalidate(String namespace);
+
+ public void invalidateAll();
+
+
+
+}
Added: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheServiceImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheServiceImpl.java (rev 0)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IdentityCacheServiceImpl.java 2010-03-09 08:01:28 UTC (rev 2049)
@@ -0,0 +1,68 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2010, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.exoplatform.services.organization.idm;
+
+import org.picketlink.idm.cache.APICacheProvider;
+
+import java.util.LinkedList;
+import java.util.List;
+
+
+/*
+ * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
+ */
+public class IdentityCacheServiceImpl implements IdentityCacheService
+{
+
+ private final List<APICacheProvider> cacheProviders = new LinkedList<APICacheProvider>();
+
+ public IdentityCacheServiceImpl()
+ {
+ }
+
+ public void register(APICacheProvider cacheProvider)
+ {
+
+ if (cacheProvider != null)
+ {
+ cacheProviders.add(cacheProvider);
+ }
+
+ }
+
+ public void invalidate(String namespace)
+ {
+ for (APICacheProvider cacheProvider : cacheProviders)
+ {
+ cacheProvider.invalidate(namespace);
+ }
+ }
+
+ public void invalidateAll()
+ {
+ for (APICacheProvider cacheProvider : cacheProviders)
+ {
+ cacheProvider.invalidateAll();
+ }
+ }
+}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2010-03-09 08:01:28 UTC (rev 2049)
@@ -29,12 +29,15 @@
import org.picketlink.idm.api.IdentitySession;
import org.picketlink.idm.api.IdentitySessionFactory;
import org.picketlink.idm.api.cfg.IdentityConfiguration;
+import org.picketlink.idm.cache.APICacheProvider;
import org.picketlink.idm.common.exception.IdentityConfigurationException;
+import org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl;
import org.picketlink.idm.impl.configuration.IdentityConfigurationImpl;
import org.picketlink.idm.impl.configuration.jaxb2.JAXB2IdentityConfiguration;
import org.picketlink.idm.spi.configuration.metadata.IdentityConfigurationMetaData;
import org.picocontainer.Startable;
+import java.io.InputStream;
import java.net.URL;
import javax.naming.InitialContext;
@@ -59,14 +62,16 @@
public static final String REALM_NAME_OPTION = "portalRealm";
- // We may have several portal containers thus we need one indentitySessionFactory per portal container
- // private static IdentitySessionFactory identitySessionFactory;
+ public static final String CACHE_CONFIG_OPTION = "cacheConfig";
+
private IdentitySessionFactory identitySessionFactory;
private String config;
- private String realmName = "PortalRealm";
+ private String realmName = "idm_realm";
+ private String cacheConfig;
+
private IdentityConfiguration identityConfiguration;
private PicketLinkIDMServiceImpl()
@@ -77,11 +82,13 @@
InitParams initParams,
HibernateService hibernateService,
ConfigurationManager confManager,
+ IdentityCacheService identityCache,
InitialContextInitializer dependency) throws Exception
{
ValueParam config = initParams.getValueParam(PARAM_CONFIG_OPTION);
ValueParam jndiName = initParams.getValueParam(PARAM_JNDI_NAME_OPTION);
ValueParam realmName = initParams.getValueParam(REALM_NAME_OPTION);
+ ValueParam cacheConfig = initParams.getValueParam(CACHE_CONFIG_OPTION);
if (config == null && jndiName == null)
{
@@ -103,12 +110,23 @@
throw new IllegalStateException("Cannot fine resource: " + this.config);
}
+
+
IdentityConfigurationMetaData configMD =
JAXB2IdentityConfiguration.createConfigurationMetaData(confManager.getInputStream(this.config));
identityConfiguration = new IdentityConfigurationImpl().configure(configMD);
identityConfiguration.getIdentityConfigurationRegistry().register(hibernateService.getSessionFactory(), "hibernateSessionFactory");
+
+ if (cacheConfig != null)
+ {
+ InputStream configStream = confManager.getInputStream(cacheConfig.getValue());
+ JBossCacheAPICacheProviderImpl cacheProvider = new JBossCacheAPICacheProviderImpl();
+ cacheProvider.initialize(configStream);
+ identityCache.register(cacheProvider);
+ identityConfiguration.getIdentityConfigurationRegistry().register(cacheProvider, "apiCacheProvider");
+ }
}
else
{
Modified: portal/trunk/component/identity/src/test/java/conf/portal/idm-configuration.xml
===================================================================
--- portal/trunk/component/identity/src/test/java/conf/portal/idm-configuration.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/component/identity/src/test/java/conf/portal/idm-configuration.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,6 +25,11 @@
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
<component>
+ <key>org.exoplatform.services.organization.idm.IdentityCacheService</key>
+ <type>org.exoplatform.services.organization.idm.IdentityCacheServiceImpl</type>
+ </component>
+
+ <component>
<key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
<type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type>
<init-params>
Modified: portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml
===================================================================
--- portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,6 +25,10 @@
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.services.organization.idm.IdentityCacheService</key>
+ <type>org.exoplatform.services.organization.idm.IdentityCacheServiceImpl</type>
+ </component>
<component>
<key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
Modified: portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml
===================================================================
--- portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,7 +25,7 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>PortalRealm</id>
+ <id>idm_realm</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/pom.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -46,7 +46,7 @@
<org.gatein.common.version>2.0.0-CR03</org.gatein.common.version>
<org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version>
<org.gatein.pc.version>2.1.0-CR05</org.gatein.pc.version>
- <org.picketlink.idm>1.1.0.Beta8</org.picketlink.idm>
+ <org.picketlink.idm>1.1.0.Beta9</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>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
-
-</jbosscache>
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-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -23,9 +23,14 @@
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
+
<component>
+ <key>org.exoplatform.services.organization.idm.IdentityCacheService</key>
+ <type>org.exoplatform.services.organization.idm.IdentityCacheServiceImpl</type>
+ </component>
+
+ <component>
<key>org.exoplatform.services.database.HibernateService</key>
<jmx-name>database:type=HibernateService</jmx-name>
<type>org.exoplatform.services.database.impl.HibernateServiceImpl</type>
@@ -70,11 +75,19 @@
<!--<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml</value>-->
</value-param>
+
+ <!-- In default PicketLink IDM configuration hibernate store will namespace identity objects using this realm name
+ if you want to share DB between portal and also share the same identity data remove the "${container.name.suffix}" part-->
<value-param>
<name>portalRealm</name>
- <value>realm${container.name.suffix}</value>
+ <value>idm_realm${container.name.suffix}</value>
</value-param>
+ <value-param>
+ <name>cacheConfig</name>
+ <value>war:/conf/organization/picketlink-idm/jboss-cache.xml</value>
+ </value-param>
+
</init-params>
</component>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,26 +25,35 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>realm</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
+ <id>idm_realm</id>
+ <repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
+ <options>
+ <option>
+ <name>template</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
+ </option>
+ </options>
</realm>
<realm>
- <id>realm_portal</id>
+ <id>idm_realm_portal</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
+ <options>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
+ </option>
+ </options>
</realm>
- <realm>
- <id>realm_sample-portal</id>
- <repository-id-ref>SamplePortalRepository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
</realms>
<repositories>
<repository>
@@ -77,7 +86,7 @@
</options>
</repository>
<repository>
- <id>SamplePortalRepository</id>
+ <id>DefaultPortalRepository</id>
<class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
<external-config/>
<default-identity-store-id>HibernateStore</default-identity-store-id>
@@ -360,4 +369,10 @@
</identity-store>
</identity-stores>
</stores>
+ <options>
+ <option>
+ <name>defaultTemplate</name>
+ <value>idm_realm</value>
+ </option>
+ </options>
</jboss-identity>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,26 +25,35 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>realm</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
+ <id>idm_realm</id>
+ <repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
+ <options>
+ <option>
+ <name>template</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
+ </option>
+ </options>
</realm>
<realm>
- <id>realm_portal</id>
+ <id>idm_realm_portal</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
+ <options>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
+ </option>
+ </options>
</realm>
- <realm>
- <id>realm_sample-portal</id>
- <repository-id-ref>SamplePortalRepository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
</realms>
<repositories>
<repository>
@@ -72,7 +81,7 @@
</options>
</repository>
<repository>
- <id>SamplePortalRepository</id>
+ <id>DefaultPortalRepository</id>
<class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
<external-config/>
<default-identity-store-id>HibernateStore</default-identity-store-id>
@@ -296,4 +305,10 @@
</identity-store>
</identity-stores>
</stores>
+ <options>
+ <option>
+ <name>defaultTemplate</name>
+ <value>idm_realm</value>
+ </option>
+ </options>
</jboss-identity>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,26 +25,35 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>realm</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
+ <id>idm_realm</id>
+ <repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
+ <options>
+ <option>
+ <name>template</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
+ </option>
+ </options>
</realm>
<realm>
- <id>realm_portal</id>
+ <id>idm_realm_portal</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
+ <options>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
+ </option>
+ </options>
</realm>
- <realm>
- <id>realm_sample-portal</id>
- <repository-id-ref>SamplePortalRepository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
</realms>
<repositories>
<repository>
@@ -71,7 +80,7 @@
</options>
</repository>
<repository>
- <id>SamplePortalRepository</id>
+ <id>DefaultPortalRepository</id>
<class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
<external-config/>
<default-identity-store-id>HibernateStore</default-identity-store-id>
@@ -369,4 +378,10 @@
</identity-store>
</identity-stores>
</stores>
+ <options>
+ <option>
+ <name>defaultTemplate</name>
+ <value>idm_realm</value>
+ </option>
+ </options>
</jboss-identity>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,26 +25,35 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>realm</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
+ <id>idm_realm</id>
+ <repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
+ <options>
+ <option>
+ <name>template</name>
+ <value>true</value>
+ </option>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
+ </option>
+ </options>
</realm>
<realm>
- <id>realm_portal</id>
+ <id>idm_realm_portal</id>
<repository-id-ref>PortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
+ <options>
+ <option>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
+ </option>
+ </options>
</realm>
- <realm>
- <id>realm_sample-portal</id>
- <repository-id-ref>SamplePortalRepository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- </realm>
</realms>
<repositories>
<repository>
@@ -76,7 +85,7 @@
</options>
</repository>
<repository>
- <id>SamplePortalRepository</id>
+ <id>DefaultPortalRepository</id>
<class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
<external-config/>
<default-identity-store-id>HibernateStore</default-identity-store-id>
@@ -323,4 +332,10 @@
</identity-store>
</identity-stores>
</stores>
+ <options>
+ <option>
+ <name>defaultTemplate</name>
+ <value>idm_realm</value>
+ </option>
+ </options>
</jboss-identity>
\ No newline at end of file
Copied: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml (from rev 2040, portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/picketlink-idm/jboss-cache.xml)
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
+
+</jbosscache>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-03-09 07:39:21 UTC (rev 2048)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-03-09 08:01:28 UTC (rev 2049)
@@ -25,60 +25,26 @@
xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd">
<realms>
<realm>
- <id>realm</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
+ <id>idm_realm</id>
+ <repository-id-ref>DefaultPortalRepository</repository-id-ref>
<identity-type-mappings>
<user-mapping>USER</user-mapping>
</identity-type-mappings>
<options>
<option>
- <name>cache.providerClass</name>
- <value>org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl</value>
+ <name>template</name>
+ <value>true</value>
</option>
<option>
- <name>cache.configFile</name>
- <value>picketlink-idm/jboss-cache.xml</value>
+ <name>cache.providerRegistryName</name>
+ <value>apiCacheProvider</value>
</option>
</options>
</realm>
- <realm>
- <id>realm_portal</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- <options>
- <option>
- <name>cache.providerClass</name>
- <value>org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl</value>
- </option>
- <option>
- <name>cache.configFile</name>
- <value>picketlink-idm/jboss-cache.xml</value>
- </option>
- </options>
- </realm>
- <realm>
- <id>realm_sample-portal</id>
- <repository-id-ref>PortalRepository</repository-id-ref>
- <identity-type-mappings>
- <user-mapping>USER</user-mapping>
- </identity-type-mappings>
- <options>
- <option>
- <name>cache.providerClass</name>
- <value>org.picketlink.idm.impl.cache.JBossCacheAPICacheProviderImpl</value>
- </option>
- <option>
- <name>cache.configFile</name>
- <value>picketlink-idm/jboss-cache.xml</value>
- </option>
- </options>
- </realm>
</realms>
<repositories>
<repository>
- <id>PortalRepository</id>
+ <id>DefaultPortalRepository</id>
<class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
<external-config/>
<default-identity-store-id>HibernateStore</default-identity-store-id>
@@ -136,4 +102,10 @@
</identity-store>
</identity-stores>
</stores>
+ <options>
+ <option>
+ <name>defaultTemplate</name>
+ <value>idm_realm</value>
+ </option>
+ </options>
</jboss-identity>
\ No newline at end of file
14 years, 9 months
gatein SVN: r2048 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-03-09 02:39:21 -0500 (Tue, 09 Mar 2010)
New Revision: 2048
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java
Log:
GTNPORTAL-270: UserInfoPortlet doesn't change info after click save in UIAccountProfiles
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2010-03-09 07:07:36 UTC (rev 2047)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2010-03-09 07:39:21 UTC (rev 2048)
@@ -21,9 +21,12 @@
import org.exoplatform.portal.pom.config.Utils;
import org.exoplatform.portal.webui.util.Util;
+import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.Query;
import org.exoplatform.services.organization.User;
+import org.exoplatform.services.security.ConversationState;
+import org.exoplatform.web.CacheUserProfileFilter;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -104,7 +107,7 @@
User user = service.getUserHandler().findUserByName(userName);
String oldEmail = user.getEmail();
String newEmail = uiForm.getUIStringInput("email").getValue();
-
+
// Check if mail address is already used
Query query = new Query();
query.setEmail(newEmail);
@@ -121,7 +124,15 @@
user.setEmail(newEmail);
uiApp.addMessage(new ApplicationMessage("UIAccountProfiles.msg.update.success", null));
service.getUserHandler().saveUser(user, true);
- return;
+
+ UIWorkingWorkspace uiWorkingWS = Util.getUIPortalApplication().getChild(UIWorkingWorkspace.class);
+ ConversationState state = ConversationState.getCurrent();
+ if (userName.equals(((User)state.getAttribute(CacheUserProfileFilter.USER_PROFILE)).getUserName()))
+ {
+ state.setAttribute(CacheUserProfileFilter.USER_PROFILE, user);
+ uiWorkingWS.updatePortletsByName("UserInfoPortlet");
+ }
+ uiWorkingWS.updatePortletsByName("OrganizationPortlet");
}
}
}
14 years, 9 months
gatein SVN: r2047 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-03-09 02:07:36 -0500 (Tue, 09 Mar 2010)
New Revision: 2047
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_002.html
Log:
Update "Test_POR_09_002.html"
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_002.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_002.html 2010-03-09 04:54:43 UTC (rev 2046)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_09_002.html 2010-03-09 07:07:36 UTC (rev 2047)
@@ -142,11 +142,6 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>link=Platform</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Administrators</td>
<td></td>
@@ -182,6 +177,16 @@
<td></td>
</tr>
<tr>
+ <td>waitForText</td>
+ <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[2]/div</td>
+ <td>Test_POR_09_002</td>
+</tr>
+<tr>
+ <td>verifyText</td>
+ <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[2]/div</td>
+ <td>Test_POR_09_002</td>
+</tr>
+<tr>
<td>echo</td>
<td>--Delete portal--</td>
<td></td>
14 years, 9 months