gatein SVN: r7683 - in sandbox/as7_support/branches/gatein-as7/wci: exo and 21 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-10-06 11:53:08 -0400 (Thu, 06 Oct 2011)
New Revision: 7683
Modified:
sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss42/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml
Log:
Continue development on 2.1.0-Beta07-SNAPSHOT
Modified: sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
@@ -13,7 +13,6 @@
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 6 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss7</artifactId>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 7 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss</artifactId>
@@ -13,4 +13,4 @@
<module>jboss6</module>
<module>jboss7</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Gatein Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Native Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-portlets</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss42/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss42/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss42/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss42</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
@@ -13,4 +13,4 @@
<module>tomcat6</module>
<module>tomcat7</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 6 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 7 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml 2011-10-06 15:53:08 UTC (rev 7683)
@@ -2,10 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
<packaging>jar</packaging>
<name>GateIn - Web Container Integration component (wci)</name>
13 years, 3 months
gatein SVN: r7682 - in epp/portal/branches/EPP_5_2_Branch: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-06 11:07:16 -0400 (Thu, 06 Oct 2011)
New Revision: 7682
Added:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
Modified:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipByGroupPageList.java
Log:
JBEPP-909 All memberships needs to be obtained when change group in UIGroupExplorer
Added: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java 2011-10-06 15:07:16 UTC (rev 7682)
@@ -0,0 +1,186 @@
+/**
+* Copyright (C) 2009 eXo Platform SAS.
+*
+* 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.exoplatform.commons.utils.ListAccess;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.services.organization.Membership;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.impl.GroupImpl;
+import org.exoplatform.services.organization.impl.UserImpl;
+import org.gatein.common.logging.LogLevel;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+import org.picketlink.idm.api.Group;
+import org.picketlink.idm.api.IdentitySearchCriteria;
+import org.picketlink.idm.api.Role;
+import org.picketlink.idm.api.SortOrder;
+import org.picketlink.idm.api.query.UserQuery;
+import org.picketlink.idm.impl.api.IdentitySearchCriteriaImpl;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+
+/*
+* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
+*/
+public class IDMMembershipListAccess implements ListAccess<Membership>, Serializable
+{
+ private static Logger log = LoggerFactory.getLogger(IDMMembershipListAccess.class);
+
+ private final Group group;
+
+ private final org.picketlink.idm.api.User user;
+
+ private int size = -1;
+
+ public IDMMembershipListAccess(Group group)
+ {
+ this.group = group;
+ this.user = null;
+ }
+
+ public IDMMembershipListAccess(org.picketlink.idm.api.User user)
+ {
+ this.group = null;
+ this.user = user;
+ }
+
+ public Membership[] load(int index, int length) throws Exception, IllegalArgumentException
+ {
+ if (log.isTraceEnabled())
+ {
+ Tools.logMethodIn(
+ log,
+ LogLevel.TRACE,
+ "load",
+ new Object[]{
+ "index", index,
+ "length", length
+ }
+ );
+ }
+
+ IdentitySearchCriteria crit = new IdentitySearchCriteriaImpl().page(index, length);
+ crit.sort(SortOrder.ASCENDING);
+
+
+ List<Role> roles = null;
+
+ if (group != null)
+ {
+ roles = new LinkedList<Role>(getIDMService().getIdentitySession().getRoleManager().findRoles(group, null, crit));
+ }
+ else if (user != null)
+ {
+ roles = new LinkedList<Role>(getIDMService().getIdentitySession().getRoleManager().findRoles(user, null, crit));
+ }
+
+ Membership[] memberships = new Membership[roles.size()];
+
+ for (int i = 0; i < roles.size(); i++)
+ {
+
+ Role role = roles.get(i);
+
+ org.exoplatform.services.organization.Group exoGroup =
+ ((GroupDAOImpl)getOrganizationService().getGroupHandler()).convertGroup(role.getGroup());
+
+ MembershipImpl memb = new MembershipImpl();
+ memb.setGroupId(exoGroup.getId());
+ memb.setUserName(role.getUser().getId());
+ memb.setMembershipType(role.getRoleType().getName());
+
+ memberships[i] = memb;
+ }
+
+ if (log.isTraceEnabled())
+ {
+ Tools.logMethodOut(
+ log,
+ LogLevel.TRACE,
+ "load",
+ memberships
+ );
+ }
+
+ return memberships;
+ }
+
+ public int getSize() throws Exception
+ {
+ if (log.isTraceEnabled())
+ {
+ Tools.logMethodIn(
+ log,
+ LogLevel.TRACE,
+ "getSize",
+ null
+ );
+ }
+
+ int result = 0;
+
+ if (size < 0)
+ {
+ if (group != null && user == null)
+ {
+ result = getIDMService().getIdentitySession().getRoleManager().getRolesCount(group, null, null);
+ }
+ else if (group == null && user != null)
+ {
+ result = getIDMService().getIdentitySession().getRoleManager().getRolesCount(user, null, null);
+ }
+
+ size = result;
+ }
+ else
+ {
+ result = size;
+ }
+
+ if (log.isTraceEnabled())
+ {
+ Tools.logMethodOut(
+ log,
+ LogLevel.TRACE,
+ "getSize",
+ result
+ );
+ }
+
+ return result;
+
+ }
+
+ PicketLinkIDMService getIDMService()
+ {
+ return (PicketLinkIDMService)
+ PortalContainer.getInstance().getComponentInstanceOfType(PicketLinkIDMService.class);
+ }
+
+ PicketLinkIDMOrganizationServiceImpl getOrganizationService()
+ {
+ return (PicketLinkIDMOrganizationServiceImpl)
+ PortalContainer.getInstance().getComponentInstanceOfType(OrganizationService.class);
+ }
+}
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2011-10-06 13:51:56 UTC (rev 7681)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2011-10-06 15:07:16 UTC (rev 7682)
@@ -763,8 +763,19 @@
return result;
}
+
+ public ListAccess<Membership> findAllMembershipsByUser(User user) throws Exception
+ {
+ org.picketlink.idm.api.User gtnUser = service_.getIdentitySession().getPersistenceManager().findUser(user.getUserName());
+
+ if (gtnUser == null)
+ {
+ log.log(LogLevel.ERROR, "Internal ERROR. Cannot obtain user: " + user.getUserName());
+ return new ListAccessImpl(Membership.class, Collections.emptyList());
+ }
+ return new IDMMembershipListAccess(gtnUser);
+ }
-
public Collection findMembershipsByGroup(Group group) throws Exception
{
return findMembershipsByGroupId(group.getId());
@@ -772,7 +783,20 @@
public ListAccess<Membership> findAllMembershipsByGroup(Group group) throws Exception
{
- return new ListAccessImpl(Membership.class, (List)findMembershipsByGroup(group));
+ String plGroupName = getPLIDMGroupName(getGroupNameFromId(group.getId()));
+
+ String gid =
+ getIdentitySession().getPersistenceManager().
+ createGroupKey(plGroupName, getGroupTypeFromId(group.getId()));
+
+ org.picketlink.idm.api.Group gtnGroup = service_.getIdentitySession().getPersistenceManager().findGroupByKey(gid);
+
+ if (gtnGroup == null)
+ {
+ log.log(LogLevel.ERROR, "Internal ERROR. Cannot obtain group: " + group.getId());
+ return new ListAccessImpl(Membership.class, Collections.emptyList());
+ }
+ return new IDMMembershipListAccess(gtnGroup);
}
public Collection findMembershipsByGroupId(String groupId) throws Exception
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-06 13:51:56 UTC (rev 7681)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-06 15:07:16 UTC (rev 7682)
@@ -52,7 +52,7 @@
<org.gatein.dep.version>1.1.0-GA</org.gatein.dep.version>
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
- <org.picketlink.idm>1.3.0.Alpha06</org.picketlink.idm>
+ <org.picketlink.idm>1.3.0.Alpha08</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta07-EPP520</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.0-Beta04</org.gatein.mgmt.version>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipByGroupPageList.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipByGroupPageList.java 2011-10-06 13:51:56 UTC (rev 7681)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipByGroupPageList.java 2011-10-06 15:07:16 UTC (rev 7682)
@@ -50,7 +50,6 @@
OrganizationService service = (OrganizationService)container.getComponentInstance(OrganizationService.class);
MembershipHandler handler = service.getMembershipHandler();
Group group = service.getGroupHandler().findGroupById(state);
- List<Membership> memberships = (List<Membership>)handler.findMembershipsByGroup(group);
- return new ListAccessImpl<Membership>(Membership.class, memberships);
+ return handler.findAllMembershipsByGroup(group);
}
}
13 years, 3 months
gatein SVN: r7681 - in portal/trunk: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-06 09:51:56 -0400 (Thu, 06 Oct 2011)
New Revision: 7681
Added:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
portal/trunk/pom.xml
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipByGroupPageList.java
Log:
GTNPORTAL-1888 All memberships needs to be obtained when change group in UIGroupExplorer
Added: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java (rev 0)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java 2011-10-06 13:51:56 UTC (rev 7681)
@@ -0,0 +1,186 @@
+/**
+* Copyright (C) 2009 eXo Platform SAS.
+*
+* 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.exoplatform.commons.utils.ListAccess;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.services.organization.Membership;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.impl.GroupImpl;
+import org.exoplatform.services.organization.impl.UserImpl;
+import org.gatein.common.logging.LogLevel;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+import org.picketlink.idm.api.Group;
+import org.picketlink.idm.api.IdentitySearchCriteria;
+import org.picketlink.idm.api.Role;
+import org.picketlink.idm.api.SortOrder;
+import org.picketlink.idm.api.query.UserQuery;
+import org.picketlink.idm.impl.api.IdentitySearchCriteriaImpl;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+
+/*
+* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
+*/
+public class IDMMembershipListAccess implements ListAccess<Membership>, Serializable
+{
+ private static Logger log = LoggerFactory.getLogger(IDMMembershipListAccess.class);
+
+ private final Group group;
+
+ private final org.picketlink.idm.api.User user;
+
+ private int size = -1;
+
+ public IDMMembershipListAccess(Group group)
+ {
+ this.group = group;
+ this.user = null;
+ }
+
+ public IDMMembershipListAccess(org.picketlink.idm.api.User user)
+ {
+ this.group = null;
+ this.user = user;
+ }
+
+ public Membership[] load(int index, int length) throws Exception, IllegalArgumentException
+ {
+ if (log.isTraceEnabled())
+ {
+ Tools.logMethodIn(
+ log,
+ LogLevel.TRACE,
+ "load",
+ new Object[]{
+ "index", index,
+ "length", length
+ }
+ );
+ }
+
+ IdentitySearchCriteria crit = new IdentitySearchCriteriaImpl().page(index, length);
+ crit.sort(SortOrder.ASCENDING);
+
+
+ List<Role> roles = null;
+
+ if (group != null)
+ {
+ roles = new LinkedList<Role>(getIDMService().getIdentitySession().getRoleManager().findRoles(group, null, crit));
+ }
+ else if (user != null)
+ {
+ roles = new LinkedList<Role>(getIDMService().getIdentitySession().getRoleManager().findRoles(user, null, crit));
+ }
+
+ Membership[] memberships = new Membership[roles.size()];
+
+ for (int i = 0; i < roles.size(); i++)
+ {
+
+ Role role = roles.get(i);
+
+ org.exoplatform.services.organization.Group exoGroup =
+ ((GroupDAOImpl)getOrganizationService().getGroupHandler()).convertGroup(role.getGroup());
+
+ MembershipImpl memb = new MembershipImpl();
+ memb.setGroupId(exoGroup.getId());
+ memb.setUserName(role.getUser().getId());
+ memb.setMembershipType(role.getRoleType().getName());
+
+ memberships[i] = memb;
+ }
+
+ if (log.isTraceEnabled())
+ {
+ Tools.logMethodOut(
+ log,
+ LogLevel.TRACE,
+ "load",
+ memberships
+ );
+ }
+
+ return memberships;
+ }
+
+ public int getSize() throws Exception
+ {
+ if (log.isTraceEnabled())
+ {
+ Tools.logMethodIn(
+ log,
+ LogLevel.TRACE,
+ "getSize",
+ null
+ );
+ }
+
+ int result = 0;
+
+ if (size < 0)
+ {
+ if (group != null && user == null)
+ {
+ result = getIDMService().getIdentitySession().getRoleManager().getRolesCount(group, null, null);
+ }
+ else if (group == null && user != null)
+ {
+ result = getIDMService().getIdentitySession().getRoleManager().getRolesCount(user, null, null);
+ }
+
+ size = result;
+ }
+ else
+ {
+ result = size;
+ }
+
+ if (log.isTraceEnabled())
+ {
+ Tools.logMethodOut(
+ log,
+ LogLevel.TRACE,
+ "getSize",
+ result
+ );
+ }
+
+ return result;
+
+ }
+
+ PicketLinkIDMService getIDMService()
+ {
+ return (PicketLinkIDMService)
+ PortalContainer.getInstance().getComponentInstanceOfType(PicketLinkIDMService.class);
+ }
+
+ PicketLinkIDMOrganizationServiceImpl getOrganizationService()
+ {
+ return (PicketLinkIDMOrganizationServiceImpl)
+ PortalContainer.getInstance().getComponentInstanceOfType(OrganizationService.class);
+ }
+}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2011-10-06 11:37:55 UTC (rev 7680)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2011-10-06 13:51:56 UTC (rev 7681)
@@ -763,8 +763,19 @@
return result;
}
+
+ public ListAccess<Membership> findAllMembershipsByUser(User user) throws Exception
+ {
+ org.picketlink.idm.api.User gtnUser = service_.getIdentitySession().getPersistenceManager().findUser(user.getUserName());
+
+ if (gtnUser == null)
+ {
+ log.log(LogLevel.ERROR, "Internal ERROR. Cannot obtain user: " + user.getUserName());
+ return new ListAccessImpl(Membership.class, Collections.emptyList());
+ }
+ return new IDMMembershipListAccess(gtnUser);
+ }
-
public Collection findMembershipsByGroup(Group group) throws Exception
{
return findMembershipsByGroupId(group.getId());
@@ -772,7 +783,20 @@
public ListAccess<Membership> findAllMembershipsByGroup(Group group) throws Exception
{
- return new ListAccessImpl(Membership.class, (List)findMembershipsByGroup(group));
+ String plGroupName = getPLIDMGroupName(getGroupNameFromId(group.getId()));
+
+ String gid =
+ getIdentitySession().getPersistenceManager().
+ createGroupKey(plGroupName, getGroupTypeFromId(group.getId()));
+
+ org.picketlink.idm.api.Group gtnGroup = service_.getIdentitySession().getPersistenceManager().findGroupByKey(gid);
+
+ if (gtnGroup == null)
+ {
+ log.log(LogLevel.ERROR, "Internal ERROR. Cannot obtain group: " + group.getId());
+ return new ListAccessImpl(Membership.class, Collections.emptyList());
+ }
+ return new IDMMembershipListAccess(gtnGroup);
}
public Collection findMembershipsByGroupId(String groupId) throws Exception
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-10-06 11:37:55 UTC (rev 7680)
+++ portal/trunk/pom.xml 2011-10-06 13:51:56 UTC (rev 7681)
@@ -46,7 +46,7 @@
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
- <org.picketlink.idm>1.3.0.Alpha04</org.picketlink.idm>
+ <org.picketlink.idm>1.3.0.Alpha08</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta07</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.0-Beta04</org.gatein.mgmt.version>
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipByGroupPageList.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipByGroupPageList.java 2011-10-06 11:37:55 UTC (rev 7680)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipByGroupPageList.java 2011-10-06 13:51:56 UTC (rev 7681)
@@ -50,7 +50,6 @@
OrganizationService service = (OrganizationService)container.getComponentInstance(OrganizationService.class);
MembershipHandler handler = service.getMembershipHandler();
Group group = service.getGroupHandler().findGroupById(state);
- List<Membership> memberships = (List<Membership>)handler.findMembershipsByGroup(group);
- return new ListAccessImpl<Membership>(Membership.class, memberships);
+ return handler.findAllMembershipsByGroup(group);
}
}
13 years, 3 months
gatein SVN: r7680 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-10-06 07:37:55 -0400 (Thu, 06 Oct 2011)
New Revision: 7680
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
JBEPP-1261: WSRP upgrade (using productized bits)
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-06 11:35:40 UTC (rev 7679)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-06 11:37:55 UTC (rev 7680)
@@ -53,7 +53,7 @@
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha06</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.0-Beta07</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.1.0-Beta07-EPP520</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.0-Beta04</org.gatein.mgmt.version>
<org.slf4j.version>1.5.8</org.slf4j.version>
13 years, 3 months
gatein SVN: r7679 - epp/portal/branches/EPP_5_2_Branch/distribution.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-10-06 07:35:40 -0400 (Thu, 06 Oct 2011)
New Revision: 7679
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
Log:
JBEPP-1262: Upgrade SSO and PortletBridge dependencies in packaging
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-06 08:15:00 UTC (rev 7678)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-06 11:35:40 UTC (rev 7679)
@@ -18,8 +18,8 @@
<eap.dir>jboss-eap-5.1</eap.dir>
<epp.dir>jboss-epp-5.2</epp.dir>
- <sso.version>1.0.2-epp-DEV01</sso.version>
- <portletbridge.version>2.1.1.GA.EPP51</portletbridge.version>
+ <sso.version>1.1.0-Beta02</sso.version>
+ <portletbridge.version>2.2.0.CR01.EPP52</portletbridge.version>
<!-- portlet bridge directory - not used, distribution module name is used as directory name -->
<portletbridge.directory>portletbridge</portletbridge.directory>
13 years, 3 months
gatein SVN: r7678 - components/wsrp/tags/2.1.0-EPP520-Beta07.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-10-06 04:15:00 -0400 (Thu, 06 Oct 2011)
New Revision: 7678
Modified:
components/wsrp/tags/2.1.0-EPP520-Beta07/pom.xml
Log:
Dirty upgrade of WCI
Modified: components/wsrp/tags/2.1.0-EPP520-Beta07/pom.xml
===================================================================
--- components/wsrp/tags/2.1.0-EPP520-Beta07/pom.xml 2011-10-05 23:52:33 UTC (rev 7677)
+++ components/wsrp/tags/2.1.0-EPP520-Beta07/pom.xml 2011-10-06 08:15:00 UTC (rev 7678)
@@ -48,7 +48,7 @@
<properties>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version>
- <org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version>
+ <org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
<jsf.version>1.2_12</jsf.version>
<javax.xml.ws.version>2.1</javax.xml.ws.version>
13 years, 3 months
gatein SVN: r7677 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-10-05 19:52:33 -0400 (Wed, 05 Oct 2011)
New Revision: 7677
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
JBEPP-1261: Upgrade MOP, Chromattic, WSRP
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-05 22:54:48 UTC (rev 7676)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-05 23:52:33 UTC (rev 7677)
@@ -49,19 +49,19 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.parent.version>${parent.version}</org.gatein.parent.version>
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
- <org.gatein.dep.version>1.1.0-Beta06</org.gatein.dep.version>
+ <org.gatein.dep.version>1.1.0-GA</org.gatein.dep.version>
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha06</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.0-Beta06</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version>
+ <org.gatein.wsrp.version>2.1.0-Beta07</org.gatein.wsrp.version>
+ <org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.0-Beta04</org.gatein.mgmt.version>
<org.slf4j.version>1.5.8</org.slf4j.version>
<commons-pool.version>1.5.5</commons-pool.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.7.6</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.1.0-beta6</version.chromattic>
+ <version.chromattic>1.1.0</version.chromattic>
<version.reflect>1.1.0-beta12</version.reflect>
<org.staxnav.version>0.9.6</org.staxnav.version>
<jcip.version>1.0</jcip.version>
@@ -97,14 +97,10 @@
<dependencyManagement>
<dependencies>
-
- <!-- Needed becuase of a Maven bug. Components depend on gatein-dep and for some
- reasons with Maven 2.2.1 it can't find that dependency anymore
- -->
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.1.0-GA</version>
+ <version>${org.gatein.dep.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
13 years, 3 months
gatein SVN: r7675 - epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-10-05 17:37:55 -0400 (Wed, 05 Oct 2011)
New Revision: 7675
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java
Log:
JBEPP-1221: need to consider the situation where there is no logged in user. In this case, we should return false when calling the isAdministrator method.
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2011-10-05 21:09:30 UTC (rev 7674)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2011-10-05 21:37:55 UTC (rev 7675)
@@ -146,9 +146,20 @@
{
if (username == null)
username = org.exoplatform.portal.webui.util.Util.getPortalRequestContext().getRemoteUser();
- if (username.equals(getUserACL().getSuperUser()))
+
+ //if getRemoteUser() returns null, then there isn't a logged in user, which means they are not an admin
+ if (username == null)
+ {
+ return false;
+ }
+ else if (username.equals(getUserACL().getSuperUser()))
+ {
return true;
- return isMemberOfGroup(username, getUserACL().getAdminGroups());
+ }
+ else
+ {
+ return isMemberOfGroup(username, getUserACL().getAdminGroups());
+ }
}
// public static boolean isSuperUser(String username) throws Exception {
13 years, 3 months
gatein SVN: r7674 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-10-05 17:09:30 -0400 (Wed, 05 Oct 2011)
New Revision: 7674
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java
Log:
GTNPORTAL-2153: need to consider the situation where there is no logged in user. In this case, we should return false when calling the isAdministrator method.
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2011-10-05 16:28:08 UTC (rev 7673)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2011-10-05 21:09:30 UTC (rev 7674)
@@ -146,9 +146,20 @@
{
if (username == null)
username = org.exoplatform.portal.webui.util.Util.getPortalRequestContext().getRemoteUser();
- if (username.equals(getUserACL().getSuperUser()))
+
+ //if getRemoteUser() returns null, then there isn't a logged in user, which means they are not an admin
+ if (username == null)
+ {
+ return false;
+ }
+ else if (username.equals(getUserACL().getSuperUser()))
+ {
return true;
- return isMemberOfGroup(username, getUserACL().getAdminGroups());
+ }
+ else
+ {
+ return isMemberOfGroup(username, getUserACL().getAdminGroups());
+ }
}
// public static boolean isSuperUser(String username) throws Exception {
13 years, 3 months