gatein SVN: r8552 - in components/sso/trunk: agent and 17 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-08 11:51:51 -0500 (Thu, 08 Mar 2012)
New Revision: 8552
Modified:
components/sso/trunk/agent/pom.xml
components/sso/trunk/auth-callback/pom.xml
components/sso/trunk/cas/gatein-cas-plugin/pom.xml
components/sso/trunk/cas/gatein-cas-portal/pom.xml
components/sso/trunk/cas/pom.xml
components/sso/trunk/josso/gatein-agent-josso181/pom.xml
components/sso/trunk/josso/gatein-agent-josso182/pom.xml
components/sso/trunk/josso/gatein-josso-plugin/pom.xml
components/sso/trunk/josso/gatein-josso-portal/pom.xml
components/sso/trunk/josso/pom.xml
components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml
components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
components/sso/trunk/opensso/pom.xml
components/sso/trunk/packaging/pom.xml
components/sso/trunk/pom.xml
components/sso/trunk/saml/gatein-saml-plugin/pom.xml
components/sso/trunk/saml/gatein-saml-portal/pom.xml
components/sso/trunk/saml/pom.xml
components/sso/trunk/spnego/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/sso/trunk/agent/pom.xml
===================================================================
--- components/sso/trunk/agent/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/agent/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/auth-callback/pom.xml
===================================================================
--- components/sso/trunk/auth-callback/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/auth-callback/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/pom.xml
===================================================================
--- components/sso/trunk/cas/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/cas/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/josso/gatein-agent-josso181/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sso-josso-parent</artifactId>
<groupId>org.gatein.sso</groupId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/josso/gatein-agent-josso182/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sso-josso-parent</artifactId>
<groupId>org.gatein.sso</groupId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/josso/pom.xml
===================================================================
--- components/sso/trunk/josso/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/josso/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/opensso/pom.xml
===================================================================
--- components/sso/trunk/opensso/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/opensso/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/packaging/pom.xml
===================================================================
--- components/sso/trunk/packaging/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/packaging/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<packaging>pom</packaging>
<parent>
@@ -25,9 +25,9 @@
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/tags/1.1.1-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/sso/tags/1.1.1-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/sso/tags/1.1.1-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/sso/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/sso/trunk</url>
</scm>
Modified: components/sso/trunk/saml/gatein-saml-plugin/pom.xml
===================================================================
--- components/sso/trunk/saml/gatein-saml-plugin/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/saml/gatein-saml-plugin/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sso-saml-parent</artifactId>
<groupId>org.gatein.sso</groupId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/saml/gatein-saml-portal/pom.xml
===================================================================
--- components/sso/trunk/saml/gatein-saml-portal/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/saml/gatein-saml-portal/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sso-saml-parent</artifactId>
<groupId>org.gatein.sso</groupId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/saml/pom.xml
===================================================================
--- components/sso/trunk/saml/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/saml/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/spnego/pom.xml
===================================================================
--- components/sso/trunk/spnego/pom.xml 2012-03-08 16:51:26 UTC (rev 8551)
+++ components/sso/trunk/spnego/pom.xml 2012-03-08 16:51:51 UTC (rev 8552)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-GA</version>
+ <version>1.1.2-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
12 years, 9 months
- 1
- 0
gatein SVN: r8551 - components/sso/tags.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-08 11:51:26 -0500 (Thu, 08 Mar 2012)
New Revision: 8551
Added:
components/sso/tags/1.1.1-GA/
Log:
[maven-release-plugin] copy for tag 1.1.1-GA
12 years, 9 months
- 1
- 0
gatein SVN: r8550 - in components/sso/trunk: agent and 17 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-08 11:51:07 -0500 (Thu, 08 Mar 2012)
New Revision: 8550
Modified:
components/sso/trunk/agent/pom.xml
components/sso/trunk/auth-callback/pom.xml
components/sso/trunk/cas/gatein-cas-plugin/pom.xml
components/sso/trunk/cas/gatein-cas-portal/pom.xml
components/sso/trunk/cas/pom.xml
components/sso/trunk/josso/gatein-agent-josso181/pom.xml
components/sso/trunk/josso/gatein-agent-josso182/pom.xml
components/sso/trunk/josso/gatein-josso-plugin/pom.xml
components/sso/trunk/josso/gatein-josso-portal/pom.xml
components/sso/trunk/josso/pom.xml
components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml
components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
components/sso/trunk/opensso/pom.xml
components/sso/trunk/packaging/pom.xml
components/sso/trunk/pom.xml
components/sso/trunk/saml/gatein-saml-plugin/pom.xml
components/sso/trunk/saml/gatein-saml-portal/pom.xml
components/sso/trunk/saml/pom.xml
components/sso/trunk/spnego/pom.xml
Log:
[maven-release-plugin] prepare release 1.1.1-GA
Modified: components/sso/trunk/agent/pom.xml
===================================================================
--- components/sso/trunk/agent/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/agent/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/auth-callback/pom.xml
===================================================================
--- components/sso/trunk/auth-callback/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/auth-callback/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/pom.xml
===================================================================
--- components/sso/trunk/cas/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/cas/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/josso/gatein-agent-josso181/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sso-josso-parent</artifactId>
<groupId>org.gatein.sso</groupId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/josso/gatein-agent-josso182/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sso-josso-parent</artifactId>
<groupId>org.gatein.sso</groupId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/josso/pom.xml
===================================================================
--- components/sso/trunk/josso/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/josso/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/opensso/pom.xml
===================================================================
--- components/sso/trunk/opensso/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/opensso/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/packaging/pom.xml
===================================================================
--- components/sso/trunk/packaging/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/packaging/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<packaging>pom</packaging>
<parent>
@@ -25,9 +25,9 @@
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/sso/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/sso/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/tags/1.1.1-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/sso/tags/1.1.1-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/sso/tags/1.1.1-GA</url>
</scm>
Modified: components/sso/trunk/saml/gatein-saml-plugin/pom.xml
===================================================================
--- components/sso/trunk/saml/gatein-saml-plugin/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/saml/gatein-saml-plugin/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sso-saml-parent</artifactId>
<groupId>org.gatein.sso</groupId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/saml/gatein-saml-portal/pom.xml
===================================================================
--- components/sso/trunk/saml/gatein-saml-portal/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/saml/gatein-saml-portal/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -2,7 +2,7 @@
<parent>
<artifactId>sso-saml-parent</artifactId>
<groupId>org.gatein.sso</groupId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/saml/pom.xml
===================================================================
--- components/sso/trunk/saml/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/saml/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/spnego/pom.xml
===================================================================
--- components/sso/trunk/spnego/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
+++ components/sso/trunk/spnego/pom.xml 2012-03-08 16:51:07 UTC (rev 8550)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.1.1-CR03-SNAPSHOT</version>
+ <version>1.1.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
12 years, 9 months
- 1
- 0
gatein SVN: r8549 - components/sso/trunk.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-08 11:41:34 -0500 (Thu, 08 Mar 2012)
New Revision: 8549
Modified:
components/sso/trunk/pom.xml
Log:
GTNSSO-6 Update dependencies to same versions used by EPP 5.2.1
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2012-03-08 16:34:47 UTC (rev 8548)
+++ components/sso/trunk/pom.xml 2012-03-08 16:41:34 UTC (rev 8549)
@@ -77,21 +77,24 @@
<version.axis>1.4</version.axis>
<!-- exo -->
- <org.exoplatform.core.version>2.4.3-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.2.3-GA</org.exoplatform.ws.version>
- <org.gatein.wci.version>2.1.1-Beta03</org.gatein.wci.version>
+ <org.exoplatform.core.version>2.4.6-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.2.6-GA</org.exoplatform.ws.version>
+ <org.gatein.wci.version>2.1.1-GA</org.gatein.wci.version>
<!-- JAX-RS jsr-311 -->
<version.javax.ws.rs>1.0</version.javax.ws.rs>
<!-- servlet-api -->
<version.servlet-api>2.5</version.servlet-api>
+
+ <!-- JACC -->
+ <version.security.jacc>1.0</version.security.jacc>
<!-- SPNEGO support using JBoss Negotiation -->
<version.jboss.negotiation>2.0.4.GA</version.jboss.negotiation>
<!-- Picketlink federation (SAML integration) -->
- <version.picketlink.fed>2.0.1.final</version.picketlink.fed>
+ <version.picketlink.fed>2.0.2.Final</version.picketlink.fed>
</properties>
@@ -311,14 +314,14 @@
<dependency>
<groupId>javax.security</groupId>
<artifactId>jacc</artifactId>
- <version>1.0</version>
+ <version>${version.security.jacc}</version>
</dependency>
<!-- Picketlink federation (SAML) -->
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-bindings-jboss</artifactId>
- <version>2.0.1.final</version>
+ <version>${version.picketlink.fed}</version>
</dependency>
</dependencies>
@@ -399,13 +402,17 @@
<artifactId>maven-xbean-plugin</artifactId>
<version>${version.xbean}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
12 years, 9 months
- 1
- 0
gatein SVN: r8548 - in epp/portal/branches/EPP_5_2_Branch: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directory.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-03-08 11:34:47 -0500 (Thu, 08 Mar 2012)
New Revision: 8548
Modified:
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
Log:
bug 793910 calender doesnt disappear if tab is used for navigation
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2012-03-08 16:18:24 UTC (rev 8547)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UICalendar.js 2012-03-08 16:34:47 UTC (rev 8548)
@@ -162,6 +162,16 @@
}
}
+UICalendar.prototype.onTabOut =function(event)
+{
+ var keyCode = event.keyCode;
+ //identify the tab key:
+ if (keyCode == 9)
+ {
+ eXo.webui.UICalendar.hide();
+ }
+}
+
UICalendar.prototype.hide = function() {
if (this.dateField) {
document.getElementById(this.calendarId).firstChild.style.display = 'none' ;
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2012-03-08 16:18:24 UTC (rev 8547)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormDateTimeInput.java 2012-03-08 16:34:47 UTC (rev 8548)
@@ -239,6 +239,6 @@
w.write(" value=\"");
w.write(value);
w.write('\"');
- w.write(" onclick='event.cancelBubble = true'/>");
+ w.write(" onclick='event.cancelBubble = true' onkeydown='eXo.webui.UICalendar.onTabOut(event)'/>");
}
}
12 years, 9 months
- 1
- 0
gatein SVN: r8547 - in epp/portal/branches/EPP_5_1_RH_Branch: component/portal/src/main/java/org/exoplatform/portal/mop/navigation and 2 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2012-03-08 11:18:24 -0500 (Thu, 08 Mar 2012)
New Revision: 8547
Modified:
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/CacheById.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationContext.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceImpl.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceWrapper.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationState.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NodeState.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/AbstractTestNavigationService.java
epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/TestNavigationServiceSave.java
epp/portal/branches/EPP_5_1_RH_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
GTNPORTAL-2367 Replication problem with navigation nodes: add/delete navigation node are not not propagated to other nodes in cluster.
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -19,11 +19,13 @@
package org.exoplatform.portal.mop;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public enum Visibility
+public enum Visibility implements Serializable
{
/**
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/CacheById.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/CacheById.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/CacheById.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -22,6 +22,8 @@
import org.exoplatform.portal.mop.SiteKey;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.data.MappedAttributes;
+import org.exoplatform.services.cache.CacheService;
+import org.exoplatform.services.cache.ExoCache;
import org.gatein.mop.api.workspace.Navigation;
import org.gatein.mop.api.workspace.ObjectType;
import org.gatein.mop.api.workspace.Site;
@@ -59,26 +61,28 @@
private InvalidationManager invalidationManager;
/** . */
- private Map<SiteKey, NavigationContext> navigationKeyCache;
+ private ExoCache<SiteKey, NavigationContext> navigationKeyCache;
/** . */
- private Map<String, SiteKey> navigationPathCache;
+ private ExoCache<String, SiteKey> navigationPathCache;
/** . */
- private Map<String, NodeData> nodeIdCache;
+ private ExoCache<String, NodeData> nodeIdCache;
/** . */
- private Map<String, String> nodePathCache;
+ private ExoCache<String, String> nodePathCache;
/** . */
private Session bridgeSession;
- CacheById()
+ CacheById(CacheService cacheService)
{
- this.nodeIdCache = new ConcurrentHashMap<String, NodeData>(1000);
- this.nodePathCache = new ConcurrentHashMap<String, String>(1000);
- this.navigationKeyCache = new ConcurrentHashMap<SiteKey, NavigationContext>(1000);
- this.navigationPathCache = new ConcurrentHashMap<String, SiteKey>(1000);
+
+ this.nodeIdCache = cacheService.getCacheInstance("NavigationService");
+ this.nodePathCache = cacheService.getCacheInstance("NavigationService");
+ this.navigationKeyCache = cacheService.getCacheInstance("NavigationService");
+ this.navigationPathCache = cacheService.getCacheInstance("NavigationService");
+
}
NodeData getNodeData(POMSession session, String nodeId)
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationContext.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationContext.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationContext.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -21,11 +21,13 @@
import org.exoplatform.portal.mop.SiteKey;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class NavigationContext
+public class NavigationContext implements Serializable
{
/** . */
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceImpl.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceImpl.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceImpl.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -35,6 +35,7 @@
import org.exoplatform.portal.tree.diff.HierarchyChangeType;
import org.exoplatform.portal.tree.diff.HierarchyDiff;
import org.exoplatform.portal.tree.diff.ListAdapter;
+import org.exoplatform.services.cache.ExoCache;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.mop.api.Attributes;
@@ -65,14 +66,14 @@
/** . */
final Logger log = LoggerFactory.getLogger(NavigationServiceImpl.class);
- public NavigationServiceImpl(POMSessionManager manager)
+ public NavigationServiceImpl(POMSessionManager manager, Cache cache)
{
if (manager == null)
{
throw new NullPointerException("No null pom session manager allowed");
}
this.manager = manager;
- this.cache = new CacheById();
+ this.cache = cache;
}
public void start() throws Exception
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceWrapper.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceWrapper.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationServiceWrapper.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -25,6 +25,7 @@
import org.exoplatform.portal.mop.SiteKey;
import static org.exoplatform.portal.mop.navigation.Utils.*;
import org.exoplatform.portal.pom.config.POMSessionManager;
+import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.listener.ListenerService;
import org.exoplatform.services.organization.OrganizationService;
import org.gatein.common.logging.Logger;
@@ -51,9 +52,10 @@
/** . */
private ListenerService listenerService;
- public NavigationServiceWrapper(POMSessionManager manager, OrganizationService organization, ListenerService listenerService)
+ public NavigationServiceWrapper(POMSessionManager manager, OrganizationService organization, ListenerService listenerService, CacheService cacheService)
{
- this.service = new NavigationServiceImpl(manager);
+ Cache cache = new CacheById(cacheService);
+ this.service = new NavigationServiceImpl(manager, cache);
this.listenerService = listenerService;
}
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationState.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationState.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NavigationState.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -19,11 +19,13 @@
package org.exoplatform.portal.mop.navigation;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class NavigationState
+public class NavigationState implements Serializable
{
/** . */
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NodeState.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NodeState.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/navigation/NodeState.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -22,6 +22,7 @@
import org.exoplatform.commons.utils.Safe;
import org.exoplatform.portal.mop.Visibility;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -30,7 +31,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public final class NodeState
+public final class NodeState implements Serializable
{
public static class Builder
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/AbstractTestNavigationService.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/AbstractTestNavigationService.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/AbstractTestNavigationService.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -24,6 +24,7 @@
import org.exoplatform.portal.config.AbstractPortalTest;
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.pom.config.POMSessionManager;
+import org.exoplatform.services.cache.CacheService;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -40,6 +41,9 @@
/** . */
protected DataStorage dataStorage;
+ /** . */
+ protected CacheService cacheService;
+
@Override
protected void setUp() throws Exception
{
@@ -48,7 +52,8 @@
//
PortalContainer container = PortalContainer.getInstance();
mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
- service = new NavigationServiceImpl(mgr);
+ cacheService = (CacheService)container.getComponentInstanceOfType(CacheService.class);
+ service = new NavigationServiceImpl(mgr, new CacheById(cacheService));
dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class);
//
begin();
@@ -116,4 +121,9 @@
service.stop();
end();
}
+
+ protected CacheService getCacheService()
+ {
+ return cacheService;
+ }
}
Modified: epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/TestNavigationServiceSave.java
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/TestNavigationServiceSave.java 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/navigation/TestNavigationServiceSave.java 2012-03-08 16:18:24 UTC (rev 8547)
@@ -479,7 +479,8 @@
sync(true);
//
- root = new NavigationServiceImpl(mgr).loadNode(Node.MODEL, nav, Scope.CHILDREN).getNode();
+ root = new NavigationServiceImpl(mgr, new CacheById(getCacheService()))
+ .loadNode(Node.MODEL, nav, Scope.CHILDREN).getNode();
for (Node child : root.getChildren())
{
System.out.println("child : " + child.getId());
Modified: epp/portal/branches/EPP_5_1_RH_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_1_RH_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2012-03-08 13:32:18 UTC (rev 8546)
+++ epp/portal/branches/EPP_5_1_RH_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2012-03-08 16:18:24 UTC (rev 8547)
@@ -331,6 +331,60 @@
</object-param>
</init-params>
</component-plugin>
+
+ <component-plugin>
+ <name>addExoCacheConfig</name>
+ <set-method>addExoCacheConfig</set-method>
+ <type>org.exoplatform.services.cache.ExoCacheConfigPlugin</type>
+ <description>add Exo Cache Config</description>
+ <init-params>
+ <object-param>
+ <name>cache.config.NavigationService</name>
+ <description>The JBoss Cache configuration for the NavigationService</description>
+ <object type="org.exoplatform.services.cache.ExoCacheConfig">
+ <field name="name">
+ <string>NavigationService</string>
+ </field>
+ <field name="maxSize">
+ <int>5000</int>
+ </field>
+ <field name="liveTime">
+ <long>600</long>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin profiles="cluster">
+ <name>addExoCacheConfig</name>
+ <set-method>addExoCacheConfig</set-method>
+ <type>org.exoplatform.services.cache.ExoCacheConfigPlugin</type>
+ <description>add Exo Cache Config</description>
+ <init-params>
+ <object-param>
+ <name>cache.config.NavigationService</name>
+ <description>The JBoss Cache configuration for the NavigationService</description>
+ <object type="org.exoplatform.services.cache.impl.jboss.ea.EAExoCacheConfig">
+ <field name="name">
+ <string>NavigationService</string>
+ </field>
+ <field name="expirationTimeout">
+ <long>600000</long>
+ </field>
+ <field name="maxNodes">
+ <int>5000</int>
+ </field>
+ <field name="distributed">
+ <boolean>true</boolean>
+ </field>
+ <field name="replicated">
+ <boolean>true</boolean>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+
</external-component-plugins>
</configuration>
12 years, 9 months
- 1
- 0
gatein SVN: r8546 - in epp/portal/branches/EPP_5_2_Branch: component and 13 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-08 08:32:18 -0500 (Thu, 08 Mar 2012)
New Revision: 8546
Added:
epp/portal/branches/EPP_5_2_Branch/component/initializer/
epp/portal/branches/EPP_5_2_Branch/component/initializer/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/JMXOrganizationInitializer.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewGroupListener.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewMembershipListener.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewProfileListener.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewUserListener.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationInitializerJob.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationInitializerUtils.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationListenersInitializerService.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/RestOrganizationInitializer.java
epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/TriggerInitializerFilter.java
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/initializer-configuration.xml
Modified:
epp/portal/branches/EPP_5_2_Branch/component/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
Log:
Bug 793639 - (JBEPP-718) Create additional portal objects for external groups. Added new module exo.portal.component.initializer for listener related stuff
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/initializer
___________________________________________________________________
Added: svn:ignore
+ *.iml
.idea
target
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/pom.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/pom.xml 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,33 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>exo.portal.component</artifactId>
+ <groupId>org.exoplatform.portal</groupId>
+ <version>5.2.1.ER02-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.portal.component.initializer</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn Portal Component Organization Initialization Service</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.web.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.organization.api</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/JMXOrganizationInitializer.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/JMXOrganizationInitializer.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/JMXOrganizationInitializer.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.component.RequestLifeCycle;
+import org.exoplatform.management.annotations.Impact;
+import org.exoplatform.management.annotations.ImpactType;
+import org.exoplatform.management.annotations.Managed;
+import org.exoplatform.management.annotations.ManagedDescription;
+import org.exoplatform.management.annotations.ManagedName;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
+import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.Group;
+import org.exoplatform.services.organization.GroupHandler;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.UserHandler;
+import org.picocontainer.Startable;
+
+/**
+ * JMX Endpoint for accessing OrganizationListenersInitializerService stuff.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+@Managed
+@ManagedDescription("Organization Listeners Initializer Service Endpoint")
+@NameTemplate({
+ @Property(key = "name", value = "OrganizationInitializerService"),
+ @Property(key = "service", value = "OrganizationInitializerService")
+})
+public class JMXOrganizationInitializer implements Startable
+{
+
+ private OrganizationListenersInitializerService initializerService;
+ private Log log = ExoLogger.getLogger(this.getClass());
+ private OrganizationService orgService_;
+
+ // TODO: We need this as workaround to handle bug https://issues.jboss.org/browse/EXOJCR-1791 as during client calls,
+ // we need to add this container to context. It should be removed when EXOJCR-1791 will be fixed.
+ private ExoContainer exoContainer;
+
+
+ public JMXOrganizationInitializer(ExoContainerContext exoContainerContext,
+ OrganizationListenersInitializerService organizationListenersInitializerService, OrganizationService orgService)
+ {
+ this.exoContainer = exoContainerContext.getContainer();
+ this.initializerService = organizationListenersInitializerService;
+ this.orgService_=orgService;
+ }
+
+ @Managed
+ @ManagedDescription("Launch all listeners for all users and groups")
+ @Impact(ImpactType.WRITE)
+ public String launchAllListeners(@ManagedDescription("Check JCR Folders") @ManagedName("checkFolders") Boolean checkFolders)
+ {
+ // TODO: We need to encapsulate call within correct portal container by ourselves because JMX kernel layer is not doing it (Workaround for EXOJCR-1791)
+ ExoContainer oldContainer = ExoContainerContext.getCurrentContainer();
+
+ try
+ {
+ ExoContainerContext.setCurrentContainer(this.exoContainer);
+ boolean ok = initializerService.launchAll(checkFolders);
+ String responseString = ok ? "All listeners executed successfuly." : "Error occured during execution of listeners.";
+ return responseString;
+ }
+ finally
+ {
+ ExoContainerContext.setCurrentContainer(oldContainer);
+ }
+ }
+
+ /**
+ *
+ * @param userName username
+ * @param checkFolders whether to check folders in OrganizationInitializerUtils or not. If folders are not checked, we simply trigger all listeners for user, userProfile and all his memberships.
+ * @return rest response
+ */
+ @Managed
+ @ManagedDescription("Launch user listeners for single user")
+ @Impact(ImpactType.WRITE)
+ public String launchUserListeners(@ManagedDescription("userName") @ManagedName("userName") String userName,
+ @ManagedDescription("Check JCR Folders") @ManagedName("checkFolders") Boolean checkFolders)
+ {
+ UserHandler userHandler = orgService_.getUserHandler();
+ User user;
+ ExoContainer oldContainer = ExoContainerContext.getCurrentContainer();
+
+ try
+ {
+ ExoContainerContext.setCurrentContainer(this.exoContainer);
+ user = userHandler.findUserByName(userName);
+ boolean ok = initializerService.treatUser(user, checkFolders);
+ String responseString = ok ? "User listeners executed successfuly." : "Error occured during execution of user listeners.";
+ return responseString;
+ }
+ catch (Exception e)
+ {
+ log.warn("Error with user "+userName, e);
+ return "Error occured during execution of user listeners: " + e.getMessage();
+ }
+ finally
+ {
+ ExoContainerContext.setCurrentContainer(oldContainer);
+ }
+ }
+
+ @Managed
+ @ManagedDescription("Launch group listeners for single group")
+ @Impact(ImpactType.WRITE)
+ public String launchGroupListeners(@ManagedDescription("Group Name") @ManagedName("groupName") String groupName,
+ @ManagedDescription("Check JCR Folders") @ManagedName("checkFolders") Boolean checkFolders)
+ {
+ GroupHandler groupHandler = orgService_.getGroupHandler();
+ Group group;
+ ExoContainer oldContainer = ExoContainerContext.getCurrentContainer();
+
+ try
+ {
+ ExoContainerContext.setCurrentContainer(this.exoContainer);
+ group = groupHandler.findGroupById(groupName);
+ boolean ok = initializerService.treatGroup(group, checkFolders);
+ String responseString = ok ? "Group listeners executed successfuly." : "Error occured during execution of group listeners.";
+ return responseString;
+ }
+ catch (Exception e)
+ {
+ log.warn("Error with group " + groupName, e);
+ return "Error occured during execution of group listeners: " + e.getMessage();
+ }
+ finally
+ {
+ ExoContainerContext.setCurrentContainer(oldContainer);
+ }
+ }
+
+ public void start()
+ {
+ }
+
+ public void stop()
+ {
+ }
+
+}
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewGroupListener.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewGroupListener.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewGroupListener.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.organization.Group;
+import org.exoplatform.services.organization.GroupEventListener;
+
+public class NewGroupListener extends GroupEventListener {
+
+ private RepositoryService repositoryService;
+
+ public NewGroupListener(RepositoryService repositoryService) throws Exception {
+ this.repositoryService = repositoryService;
+ }
+
+ @Override
+ public void postSave(Group group, boolean isNew) throws Exception {
+ if (!OrganizationInitializerUtils.hasGroupFolder(repositoryService, group)) {
+ OrganizationInitializerUtils.createGroupFolder(repositoryService, group);
+ }
+ }
+
+ @Override
+ public void postDelete(Group group) throws Exception {
+ if (OrganizationInitializerUtils.hasGroupFolder(repositoryService, group)) {
+ OrganizationInitializerUtils.deleteGroupFolder(repositoryService, group);
+ }
+ }
+}
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewMembershipListener.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewMembershipListener.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewMembershipListener.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.organization.Membership;
+import org.exoplatform.services.organization.MembershipEventListener;
+
+public class NewMembershipListener extends MembershipEventListener {
+
+ private RepositoryService repositoryService;
+
+ public NewMembershipListener(RepositoryService repositoryService) throws Exception {
+ this.repositoryService = repositoryService;
+ }
+
+ @Override
+ public void postSave(Membership m, boolean isNew) throws Exception {
+ if (!OrganizationInitializerUtils.hasMembershipFolder(repositoryService, m)) {
+ OrganizationInitializerUtils.createMembershipFolder(repositoryService, m);
+ }
+ }
+
+ @Override
+ public void postDelete(Membership m) throws Exception {
+ if (OrganizationInitializerUtils.hasMembershipFolder(repositoryService, m)) {
+ OrganizationInitializerUtils.deleteMembershipFolder(repositoryService, m);
+ }
+ }
+}
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewProfileListener.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewProfileListener.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewProfileListener.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.organization.UserProfile;
+import org.exoplatform.services.organization.UserProfileEventListener;
+
+public class NewProfileListener extends UserProfileEventListener {
+
+ private RepositoryService repositoryService;
+
+ public NewProfileListener(RepositoryService repositoryService) throws Exception {
+ this.repositoryService = repositoryService;
+ }
+
+ @Override
+ public void postSave(UserProfile user, boolean isNew) throws Exception {
+ if (!OrganizationInitializerUtils.hasProfileFolder(repositoryService, user)) {
+ OrganizationInitializerUtils.createProfileFolder(repositoryService, user);
+ }
+ }
+
+ @Override
+ public void postDelete(UserProfile user) throws Exception {
+ if (OrganizationInitializerUtils.hasProfileFolder(repositoryService, user)) {
+ OrganizationInitializerUtils.deleteProfileFolder(repositoryService, user);
+ }
+ }
+}
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewUserListener.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewUserListener.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/NewUserListener.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.UserEventListener;
+
+public class NewUserListener extends UserEventListener {
+
+ private RepositoryService repositoryService;
+
+ public NewUserListener(RepositoryService repositoryService) throws Exception {
+ this.repositoryService = repositoryService;
+ }
+
+ @Override
+ public void postSave(User user, boolean isNew) throws Exception {
+ if (!OrganizationInitializerUtils.hasUserFolder(repositoryService, user)) {
+ OrganizationInitializerUtils.createUserFolder(repositoryService, user);
+ }
+ }
+
+ @Override
+ public void postDelete(User user) throws Exception {
+ if (OrganizationInitializerUtils.hasUserFolder(repositoryService, user)) {
+ OrganizationInitializerUtils.deleteUserFolder(repositoryService, user);
+ }
+ }
+}
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationInitializerJob.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationInitializerJob.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationInitializerJob.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.component.RequestLifeCycle;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.scheduler.BaseJob;
+import org.exoplatform.services.scheduler.JobContext;
+
+public class OrganizationInitializerJob extends BaseJob {
+
+ private static final Log LOG = ExoLogger.getLogger("job.OrganizationInitializerJob");
+
+ private OrganizationListenersInitializerService organizationListenersInitializerService_;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void execute(JobContext context) throws Exception {
+ LOG.info("File plan job started");
+ if (organizationListenersInitializerService_ == null) {
+ ExoContainer container = ExoContainerContext.getCurrentContainer();
+ organizationListenersInitializerService_ = (OrganizationListenersInitializerService) container.getComponentInstanceOfType(OrganizationListenersInitializerService.class);
+ }
+
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+
+ try
+ {
+ // TODO: Make checkFolders configurable through startup parameters? Or try existence of JCR workspace?
+ boolean checkFolders = true;
+
+ organizationListenersInitializerService_.launchAll(checkFolders);
+ }
+ finally
+ {
+ RequestLifeCycle.end();
+ }
+
+ LOG.info("Organization Listeners Initializer job done");
+ }
+}
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationInitializerUtils.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationInitializerUtils.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationInitializerUtils.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,201 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import javax.jcr.Node;
+import javax.jcr.Session;
+
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.organization.Group;
+import org.exoplatform.services.organization.Membership;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.UserProfile;
+
+public class OrganizationInitializerUtils {
+
+ final public static String ORGANIZATION_INITIALIZATIONS = "organizationInitializers".intern();
+ final public static String USERS_FOLDER = "users".intern();
+ final public static String GROUPS_FOLDER = "groups".intern();
+ final public static String MEMBERSHIPS_FOLDER = "memberships".intern();
+ final public static String PROFILES_FOLDER = "profiles".intern();
+
+ public static String REPOSITORY = "repository".intern();
+ public static String WORKSPACE = "collaboration".intern();
+ public static String HOME_PATH = "/".intern();
+
+ public static void init(Session session) throws Exception {
+ Node homePathNode = null;
+ try {
+ homePathNode = (Node) session.getItem(HOME_PATH);
+ } catch (Exception e) {}
+ if (homePathNode == null) {
+ homePathNode = createFolder(session.getRootNode(), HOME_PATH);
+ }
+ Node organizationInitializersHomePathNode = null;
+ if (!homePathNode.hasNode(ORGANIZATION_INITIALIZATIONS)) {
+ organizationInitializersHomePathNode = createFolder(homePathNode, ORGANIZATION_INITIALIZATIONS);
+ } else {
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ }
+ if (!organizationInitializersHomePathNode.hasNode(USERS_FOLDER)) {
+ createFolder(organizationInitializersHomePathNode, USERS_FOLDER);
+ }
+ if (!organizationInitializersHomePathNode.hasNode(GROUPS_FOLDER)) {
+ createFolder(organizationInitializersHomePathNode, GROUPS_FOLDER);
+ }
+ if (!organizationInitializersHomePathNode.hasNode(MEMBERSHIPS_FOLDER)) {
+ createFolder(organizationInitializersHomePathNode, MEMBERSHIPS_FOLDER);
+ }
+ if (!organizationInitializersHomePathNode.hasNode(PROFILES_FOLDER)) {
+ createFolder(organizationInitializersHomePathNode, PROFILES_FOLDER);
+ }
+ session.save();
+ }
+
+ private static Node getUsersFolder(Session session) throws Exception {
+ Node organizationInitializersHomePathNode = null;
+ try {
+ Node homePathNode = (Node) session.getItem(HOME_PATH);
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ } catch (Exception e) {
+ init(session);
+ Node homePathNode = (Node) session.getItem(HOME_PATH);
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ }
+ return organizationInitializersHomePathNode.getNode(USERS_FOLDER);
+ }
+
+ private static Node getGroupsFolder(Session session) throws Exception {
+ Node organizationInitializersHomePathNode = null;
+ try {
+ Node homePathNode = (Node) session.getItem(HOME_PATH);
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ } catch (Exception e) {
+ init(session);
+ Node homePathNode = (Node) session.getItem(HOME_PATH);
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ }
+ return organizationInitializersHomePathNode.getNode(GROUPS_FOLDER);
+ }
+
+ private static Node getMembershipsFolder(Session session) throws Exception {
+ Node organizationInitializersHomePathNode = null;
+ try {
+ Node homePathNode = (Node) session.getItem(HOME_PATH);
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ } catch (Exception e) {
+ init(session);
+ Node homePathNode = (Node) session.getItem(HOME_PATH);
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ }
+ return organizationInitializersHomePathNode.getNode(MEMBERSHIPS_FOLDER);
+ }
+
+ private static Node getProfilesFolder(Session session) throws Exception {
+ Node organizationInitializersHomePathNode = null;
+ try {
+ Node homePathNode = (Node) session.getItem(HOME_PATH);
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ } catch (Exception e) {
+ init(session);
+ Node homePathNode = (Node) session.getItem(HOME_PATH);
+ organizationInitializersHomePathNode = homePathNode.getNode(ORGANIZATION_INITIALIZATIONS);
+ }
+ return organizationInitializersHomePathNode.getNode(PROFILES_FOLDER);
+ }
+
+ public static boolean hasUserFolder(RepositoryService repositoryService, User user) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ return getUsersFolder(session).hasNode(user.getUserName());
+ }
+
+ public static boolean hasProfileFolder(RepositoryService repositoryService, UserProfile userProfile) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ return getProfilesFolder(session).hasNode(userProfile.getUserName());
+ }
+
+ public static boolean hasMembershipFolder(RepositoryService repositoryService, Membership membership) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ return getMembershipsFolder(session).hasNode(membership.getGroupId().replace("/", "") + membership.getMembershipType().toString().replace("*", "_") + membership.getUserName());
+ }
+
+ public static boolean hasGroupFolder(RepositoryService repositoryService, Group group) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ return getGroupsFolder(session).hasNode(group.getId().replace("/", "").trim());
+ }
+
+ public static void createUserFolder(RepositoryService repositoryService, User user) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ createFolder(getUsersFolder(session), user.getUserName());
+ session.save();
+ }
+
+ public static void createProfileFolder(RepositoryService repositoryService, UserProfile userProfile) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ createFolder(getProfilesFolder(session), userProfile.getUserName());
+ session.save();
+ }
+
+ public static void createMembershipFolder(RepositoryService repositoryService, Membership membership) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ createFolder(getMembershipsFolder(session), membership.getGroupId().replace("/", "") + membership.getMembershipType().toString().replace("*", "_") + membership.getUserName());
+ session.save();
+ }
+
+ public static void createGroupFolder(RepositoryService repositoryService, Group group) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ createFolder(getGroupsFolder(session), group.getId().replace("/", "").trim());
+ session.save();
+ }
+
+ public static void deleteUserFolder(RepositoryService repositoryService, User user) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ getUsersFolder(session).getNode(user.getUserName()).remove();
+ session.save();
+ }
+
+ public static void deleteProfileFolder(RepositoryService repositoryService, UserProfile userProfile) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ getProfilesFolder(session).getNode(userProfile.getUserName()).remove();
+ session.save();
+ }
+
+ public static void deleteMembershipFolder(RepositoryService repositoryService, Membership membership) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ getMembershipsFolder(session).getNode(membership.getGroupId().replace("/", "") + membership.getMembershipType().toString().replace("*", "_") + membership.getUserName()).remove();
+ session.save();
+ }
+
+ public static void deleteGroupFolder(RepositoryService repositoryService, Group group) throws Exception {
+ Session session = repositoryService.getRepository(REPOSITORY).getSystemSession(WORKSPACE);
+ getGroupsFolder(session).getNode(group.getId().replace("/", "")).remove();
+ session.save();
+ }
+
+ private static Node createFolder(Node parentNode, String name) throws Exception {
+ parentNode.addNode(name, "nt:folder");
+ parentNode.getSession().save();
+ return parentNode.getNode(name);
+ }
+}
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationListenersInitializerService.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationListenersInitializerService.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/OrganizationListenersInitializerService.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,431 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.Session;
+
+import org.exoplatform.commons.utils.PageList;
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.component.ComponentPlugin;
+import org.exoplatform.container.component.ComponentRequestLifecycle;
+import org.exoplatform.container.component.RequestLifeCycle;
+import org.exoplatform.container.configuration.ConfigurationManager;
+import org.exoplatform.container.xml.Component;
+import org.exoplatform.container.xml.ExternalComponentPlugins;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.services.jcr.RepositoryService;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.Group;
+import org.exoplatform.services.organization.GroupEventListener;
+import org.exoplatform.services.organization.Membership;
+import org.exoplatform.services.organization.MembershipEventListener;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.Query;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.UserEventListener;
+import org.exoplatform.services.organization.UserProfile;
+import org.exoplatform.services.organization.UserProfileEventListener;
+import org.picocontainer.Startable;
+
+public class OrganizationListenersInitializerService implements Startable {
+
+ private Map<String, UserEventListener> userDAOListeners_;
+ private Map<String, GroupEventListener> groupDAOListeners_;
+ private Map<String, MembershipEventListener> membershipDAOListeners_;
+ private Map<String, UserProfileEventListener> userProfileListeners_;
+ private OrganizationService organizationService;
+ private RepositoryService repositoryService;
+ private boolean executeAllListenersDuringBoot;
+ private Log log = ExoLogger.getLogger(this.getClass());
+
+ public OrganizationListenersInitializerService(OrganizationService organizationService, RepositoryService repositoryService, ConfigurationManager manager, InitParams initParams) {
+ this.organizationService = organizationService;
+ this.repositoryService = repositoryService;
+ userDAOListeners_ = new HashMap<String, UserEventListener>();
+ groupDAOListeners_ = new HashMap<String, GroupEventListener>();
+ membershipDAOListeners_ = new HashMap<String, MembershipEventListener>();
+ userProfileListeners_ = new HashMap<String, UserProfileEventListener>();
+ boolean hasExternalComponentPlugins = false;
+ int nbExternalComponentPlugins = 0;
+ try {
+ ExternalComponentPlugins organizationServiceExternalComponentPlugins = manager.getConfiguration().getExternalComponentPlugins(OrganizationListenersInitializerService.class.getName());
+
+ if (organizationServiceExternalComponentPlugins != null && organizationServiceExternalComponentPlugins.getComponentPlugins() != null) {
+ nbExternalComponentPlugins = organizationServiceExternalComponentPlugins.getComponentPlugins().size();
+ }
+
+ Component organizationServiceComponent = manager.getComponent(OrganizationListenersInitializerService.class);
+
+ if (organizationServiceComponent != null && organizationServiceComponent.getComponentPlugins() != null) {
+ nbExternalComponentPlugins += organizationServiceComponent.getComponentPlugins().size();
+ }
+ hasExternalComponentPlugins = (nbExternalComponentPlugins > 0);
+ } catch (Exception e) {
+ log.error("Test if this component has ExternalComponentPlugins generated an exception, cause:" + e.getMessage());
+ }
+
+ if (!hasExternalComponentPlugins) {
+ try {
+ ExternalComponentPlugins organizationServiceExternalComponentPlugins = manager.getConfiguration().getExternalComponentPlugins(OrganizationService.class.getName());
+ addComponentPlugin(this, organizationServiceExternalComponentPlugins.getComponentPlugins(), ExoContainerContext.getCurrentContainer());
+
+ Component organizationServiceComponent = manager.getComponent(OrganizationService.class);
+ List<org.exoplatform.container.xml.ComponentPlugin> organizationServicePlugins = organizationServiceComponent.getComponentPlugins();
+ if (organizationServicePlugins != null) {
+ addComponentPlugin(this, organizationServicePlugins, ExoContainerContext.getCurrentContainer());
+ }
+ } catch (Exception e) {
+ log.error("Failed to add OrganizationService plugins to the OrgSrvInitializer ");
+ }
+ } else {
+ log.info("This component has already " + nbExternalComponentPlugins + " ExternalComponentPlugins");
+ }
+ OrganizationInitializerUtils.REPOSITORY = initParams.getValueParam("repository").getValue();
+ OrganizationInitializerUtils.WORKSPACE = initParams.getValueParam("workspace").getValue();
+ OrganizationInitializerUtils.HOME_PATH = initParams.getValueParam("homePath").getValue();
+ this.executeAllListenersDuringBoot = Boolean.parseBoolean(initParams.getValueParam("executeAllListenersDuringBoot").getValue());
+ }
+
+ private static final Comparator<org.exoplatform.container.xml.ComponentPlugin> COMPARATOR = new Comparator<org.exoplatform.container.xml.ComponentPlugin>() {
+ public int compare(org.exoplatform.container.xml.ComponentPlugin o1, org.exoplatform.container.xml.ComponentPlugin o2) {
+ return o1.getPriority() - o2.getPriority();
+ }
+ };
+
+ @SuppressWarnings("unchecked")
+ private void addComponentPlugin(Object component, List<org.exoplatform.container.xml.ComponentPlugin> plugins, ExoContainer container) throws Exception {
+ if (plugins == null)
+ return;
+ Collections.sort(plugins, COMPARATOR);
+ for (org.exoplatform.container.xml.ComponentPlugin plugin : plugins) {
+
+ try {
+ Class clazz = Class.forName(plugin.getType());
+ ComponentPlugin cplugin = (ComponentPlugin) container.createComponent(clazz, plugin.getInitParams());
+ cplugin.setName(plugin.getName());
+ cplugin.setDescription(plugin.getDescription());
+ clazz = component.getClass();
+
+ Method m = getSetMethod(clazz, plugin.getSetMethod());
+ Object[] params = {cplugin};
+ m.invoke(component, params);
+
+ cplugin.setName(plugin.getName());
+ cplugin.setDescription(plugin.getDescription());
+ } catch (Exception ex) {
+ log.error("Failed to instanciate plugin " + plugin.getName() + "for component " + component + ": " + ex.getMessage(), ex);
+ }
+ }
+ }
+
+ private Method getSetMethod(Class clazz, String name) {
+ Method[] methods = clazz.getMethods();
+ for (Method m : methods) {
+ if (name.equals(m.getName())) {
+ Class[] types = m.getParameterTypes();
+ if (types != null && types.length == 1 && ComponentPlugin.class.isAssignableFrom(types[0])) {
+ return m;
+ }
+ }
+ }
+ return null;
+ }
+
+ public void start()
+ {
+ if (executeAllListenersDuringBoot)
+ {
+ log.info("Going to execute listeners for all users and groups");
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+
+ try
+ {
+ // TODO: Make checkFolders configurable through startup parameters? Or try existence of JCR workspace?
+ boolean checkFolders = true;
+
+ this.launchAll(checkFolders);
+ }
+ finally
+ {
+ RequestLifeCycle.end();
+ }
+ }
+ else
+ {
+ log.info("Skipped executing of listeners");
+ }
+ }
+
+
+ /**
+ * @param checkFolders whether to check folders in OrganizationInitializerUtils or not. If folders are not checked, we simply trigger all listeners for users and groups.
+ * @return true if no error occured and everything has been created correctly.
+ */
+ public boolean launchAll(boolean checkFolders) {
+
+ boolean ok = true;
+ try {
+ log.info("Launch OrganizationListenersInitializerService with checkFolders=" + checkFolders);
+
+ if (checkFolders)
+ {
+ Session session = repositoryService.getRepository(OrganizationInitializerUtils.REPOSITORY).getSystemSession(OrganizationInitializerUtils.WORKSPACE);
+ OrganizationInitializerUtils.init(session);
+ }
+
+ PageList pageList = organizationService.getUserHandler().findUsers(new Query());
+ int pagesNumber = pageList.getAvailablePage();
+ for (int i = 1; i <= pagesNumber; i++) {
+ List users = pageList.getPage(i);
+ if (log.isDebugEnabled()) {
+ log.debug("Number of users = " + users.size());
+ }
+
+ for (Object objectUser : users) {
+ User user = (User) objectUser;
+ boolean userOk = treatUser(user, checkFolders);
+
+ if (!userOk)
+ {
+ ok = false;
+ }
+ }
+ }
+
+ Collection groups = organizationService.getGroupHandler().getAllGroups();
+ if (log.isDebugEnabled()) {
+ log.debug("Groups = " + groups.size());
+ }
+ for (Object objectGroup : groups) {
+ Group group = (Group) objectGroup;
+ boolean groupOk = treatGroup(group, checkFolders);
+
+ if (!groupOk)
+ {
+ ok = false;
+ }
+ }
+ log.info("OrganizationListenersInitializerService launched successfully!");
+ } catch (Exception e) {
+ StringWriter writer = new StringWriter();
+ e.printStackTrace(new PrintWriter(writer));
+ log.error(writer.toString());
+ ok = false;
+ }
+
+ return ok;
+ }
+
+
+ public void stop() {
+ }
+
+
+ /**
+ *
+ * @param group
+ * @param checkFolders whether to check folders in OrganizationInitializerUtils or not. If folders are not checked, we simply trigger all listeners for group.
+ * @return true if no error occured and everything has been created correctly.
+ */
+ public boolean treatGroup(Group group, boolean checkFolders) {
+
+ if (group == null)
+ {
+ log.error("Group is null. This group likely does not exist.");
+ return false;
+ }
+
+ boolean ok = true;
+ if (log.isDebugEnabled())
+ {
+ log.debug("Initialize Group listener : " + group.getId() + ", checkFolders=" + checkFolders);
+ }
+
+ try {
+ if (!checkFolders || !OrganizationInitializerUtils.hasGroupFolder(repositoryService, group)) {
+ log.info("Group = " + group.getId());
+ Collection<GroupEventListener> groupDAOListeners = groupDAOListeners_.values();
+ for (GroupEventListener groupEventListener : groupDAOListeners) {
+ try {
+ groupEventListener.preSave(group, true);
+ groupEventListener.postSave(group, true);
+ } catch (Exception e) {e.printStackTrace();
+ log.warn("Failed to initialize " + group.getId() + " Group, listener = " + groupEventListener.getClass());
+ log.debug(e);
+ ok = false;
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.warn("Failed to initialize " + group.getId() + " Group listeners ", e);
+ ok = false;
+ }
+
+ return ok;
+ }
+
+ /**
+ *
+ * @param user
+ * @param checkFolders whether to check folders in OrganizationInitializerUtils or not. If folders are not checked, we simply trigger all listeners for user, userProfile and all his memberships.
+ * @return true if no error occured and everything has been created correctly.
+ */
+ public boolean treatUser (User user, boolean checkFolders) {
+ if (user == null)
+ {
+ log.error("User is null. This user likely does not exist.");
+ return false;
+ }
+
+ boolean ok = true;
+
+ if (user.getCreatedDate() == null) {
+ user.setCreatedDate(new Date());
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Initialize User listener : " + user.getUserName() + ", checkFolders=" + checkFolders);
+ }
+
+ try {
+ if (!checkFolders || !OrganizationInitializerUtils.hasUserFolder(repositoryService, user)) {
+ log.info("User loaded ======> " + user.getUserName());
+ Collection<UserEventListener> userDAOListeners = userDAOListeners_.values();
+ for (UserEventListener userEventListener : userDAOListeners) {
+ try {
+ userEventListener.preSave(user, true);
+ userEventListener.postSave(user, true);
+ } catch (Exception e) {
+ log.warn("Failed to initialize " + user.getUserName() + " User with listener : " + userEventListener.getClass());
+ log.debug("", e);
+ ok = false;
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.warn("Failed to initialize " + user.getUserName() + " User", e);
+ ok = false;
+ }
+
+ UserProfile userProfile = null;
+ try
+ {
+ userProfile = organizationService.getUserProfileHandler().findUserProfileByName(user.getUserName());
+
+ // TODO: Is this really needed? NewUserEventListener called for this user in previous step, should take care of creating UserProfile if it does not exists.
+ if (userProfile == null) {
+ userProfile = organizationService.getUserProfileHandler().createUserProfileInstance(user.getUserName());
+ organizationService.getUserProfileHandler().saveUserProfile(userProfile, true);
+ userProfile = organizationService.getUserProfileHandler().findUserProfileByName(user.getUserName());
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn("Failed to load user profile for " + user.getUserName() + " User", e);
+ ok = false;
+ }
+
+ try {
+ if (!checkFolders || !OrganizationInitializerUtils.hasProfileFolder(repositoryService, userProfile)) {
+ log.info("User profile loaded ======> " + user.getUserName());
+ Collection<UserProfileEventListener> userProfileListeners = userProfileListeners_.values();
+ for (UserProfileEventListener userProfileEventListener : userProfileListeners) {
+ try {
+ if(userProfile.getUserInfoMap() == null) {
+ userProfile.setUserInfoMap(new HashMap<String, String>());
+ }
+ userProfileEventListener.preSave(userProfile, true);
+ userProfileEventListener.postSave(userProfile, true);
+ } catch (Exception e) {
+ log.warn("Failed to initialize " + user.getUserName() + " User profile with listener : " + userProfileEventListener.getClass());
+ log.debug(e);
+ ok = false;
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.warn("Failed to initialize " + user.getUserName() + " User profile", e);
+ ok = false;
+ }
+
+ try {
+ Collection memberships = organizationService.getMembershipHandler().findMembershipsByUser(user.getUserName());
+ if (log.isDebugEnabled()) {
+ log.debug("Memberships = " + memberships.size());
+ }
+ for (Object objectMembership : memberships) {
+ Membership membership = (Membership) objectMembership;
+ try {
+ if (!checkFolders || !OrganizationInitializerUtils.hasMembershipFolder(repositoryService, membership)) {
+ log.info("Membership loaded = " + membership.getId());
+ Collection<MembershipEventListener> membershipDAOListeners = membershipDAOListeners_.values();
+ for (MembershipEventListener membershipEventListener : membershipDAOListeners) {
+ try {
+ membershipEventListener.preSave(membership, true);
+ membershipEventListener.postSave(membership, true);
+ } catch (Exception e) {
+ log.warn("Failed to initialize " + user.getUserName() + " Membership (" + membership.getId() + ") listener = " + membershipEventListener.getClass());
+ log.debug(e);
+ ok = false;
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.warn("Failed to initialize " + user.getUserName() + " Membership (" + membership.getId() + ")");
+ log.debug(e);
+ ok = false;
+ }
+ }
+ } catch (Exception e) {
+ log.warn("Failed to initialize " + user.getUserName() + " Memberships listeners", e);
+ ok = false;
+ }
+
+ return ok;
+ }
+
+ public synchronized void addListenerPlugin(ComponentPlugin listener) throws Exception {
+ if (listener instanceof UserEventListener)
+ userDAOListeners_.put(listener.getName(), (UserEventListener) listener);
+ else if (listener instanceof GroupEventListener)
+ groupDAOListeners_.put(listener.getName(), (GroupEventListener) listener);
+ else if (listener instanceof MembershipEventListener)
+ membershipDAOListeners_.put(listener.getName(), (MembershipEventListener) listener);
+ else if (listener instanceof UserProfileEventListener)
+ userProfileListeners_.put(listener.getName(), (UserProfileEventListener) listener);
+ }
+}
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/RestOrganizationInitializer.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/RestOrganizationInitializer.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/RestOrganizationInitializer.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+import org.exoplatform.management.annotations.Impact;
+import org.exoplatform.management.annotations.ImpactType;
+import org.exoplatform.management.annotations.Managed;
+import org.exoplatform.management.annotations.ManagedDescription;
+import org.exoplatform.management.annotations.ManagedName;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
+import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.Group;
+import org.exoplatform.services.organization.GroupHandler;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.UserHandler;
+import org.exoplatform.services.rest.resource.ResourceContainer;
+
+/**
+ * REST Endpoint for accessing OrganizationListenersInitializerService stuff.
+ */
+@Path("/initializer/")
+public class RestOrganizationInitializer implements ResourceContainer {
+
+ private OrganizationListenersInitializerService initializerService;
+ private Log log = ExoLogger.getLogger(this.getClass());
+ private OrganizationService orgService_;
+
+
+ public RestOrganizationInitializer(
+ OrganizationListenersInitializerService organizationListenersInitializerService, OrganizationService orgService) {
+ this.initializerService = organizationListenersInitializerService;
+ this.orgService_=orgService;
+ }
+
+
+ @GET
+ @Path("launchAllListeners/{checkFolders}")
+ public String launchAllListeners(@PathParam("checkFolders") Boolean checkFolders)
+ {
+ boolean ok = initializerService.launchAll(checkFolders);
+ String responseString = ok ? "All listeners executed successfuly." : "Error occured during execution of listeners.";
+ return responseString;
+ }
+
+
+ @GET
+ @Path("launchUserListeners/{userName}/{checkFolders}")
+ public String launchUserListeners(@PathParam("userName") String userName,
+ @PathParam("checkFolders") Boolean checkFolders) {
+ UserHandler userHandler = orgService_.getUserHandler();
+ User user;
+ try {
+ user = userHandler.findUserByName(userName);
+ boolean ok = initializerService.treatUser(user, checkFolders);
+ String responseString = ok ? "User listeners executed successfuly." : "Error occured during execution of user listeners.";
+ return responseString;
+ } catch (Exception e) {
+ log.warn("Error with user "+userName, e);
+ return "Error occured during execution of user listeners: " + e.getMessage();
+ }
+ }
+
+
+ @GET
+ @Path("launchGroupListeners/{groupName}/{checkFolders}")
+ public String launchGroupListeners(@PathParam("groupName") String groupName,
+ @PathParam("checkFolders") Boolean checkFolders)
+ {
+ // We simply can't use slash in rest url
+ groupName = groupName.replaceAll("@", "/");
+
+ GroupHandler groupHandler = orgService_.getGroupHandler();
+ Group group;
+ try
+ {
+ group = groupHandler.findGroupById(groupName);
+ boolean ok = initializerService.treatGroup(group, checkFolders);
+ String responseString = ok ? "Group listeners executed successfuly." : "Error occured during execution of group listeners.";
+ return responseString;
+ }
+ catch (Exception e)
+ {
+ log.warn("Error with group " + groupName, e);
+ return "Error occured during execution of group listeners: " + e.getMessage();
+ }
+ }
+
+}
Added: epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/TriggerInitializerFilter.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/TriggerInitializerFilter.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/initializer/src/main/java/org/exoplatform/core/component/organization/initializer/TriggerInitializerFilter.java 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,135 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.core.component.organization.initializer;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.component.RequestLifeCycle;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.Group;
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.web.filter.Filter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Collection;
+
+/**
+ * Filter will trigger listeners of {@link OrganizationListenersInitializerService} after login of user.
+ * It can be configured to trigger listeners also for all groups of this user.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class TriggerInitializerFilter implements Filter
+{
+ // Whether to check JCR folders when triggering listeners
+ private boolean checkFolders;
+
+ // If true, we will trigger listener not only for user, but also for all his groups.
+ private boolean triggerListenersForGroups;
+
+ private Log log = ExoLogger.getLogger(this.getClass());
+
+ // Flag to ensure that we will trigger listeners only once per logged user.
+ private static final String ATTR_FLAG_NAME = "TriggerInitializerFilter.flag";
+
+ public Boolean isCheckFolders()
+ {
+ return checkFolders;
+ }
+
+ public void setCheckFolders(Boolean checkFolders)
+ {
+ this.checkFolders = checkFolders;
+ }
+
+ public Boolean isTriggerListenersForGroups()
+ {
+ return triggerListenersForGroups;
+ }
+
+ public void setTriggerListenersForGroups(Boolean triggerListenersForGroups)
+ {
+ this.triggerListenersForGroups = triggerListenersForGroups;
+ }
+
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException
+ {
+ if (log.isTraceEnabled())
+ {
+ log.trace("filter in progress. checkFolders=" + checkFolders + ", TriggerListenersForGroups=" + triggerListenersForGroups);
+ }
+
+ HttpServletRequest httpServletRequest = (HttpServletRequest)servletRequest;
+
+ //
+ if (httpServletRequest.getRemoteUser() != null && httpServletRequest.getSession().getAttribute(ATTR_FLAG_NAME) == null)
+ {
+ // Find services with ExoContainer
+ ExoContainer container = ExoContainerContext.getCurrentContainer();
+ OrganizationListenersInitializerService initializer = (OrganizationListenersInitializerService)container.getComponentInstanceOfType(OrganizationListenersInitializerService.class);
+ OrganizationService orgService = (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class);
+
+ // Encapsulate with RequestLifeCycle
+ RequestLifeCycle.begin(container);
+ try
+ {
+ // Find user and trigger listeners for him
+ String username = httpServletRequest.getRemoteUser();
+ User user = orgService.getUserHandler().findUserByName(username);
+ initializer.treatUser(user, checkFolders);
+
+ // This means that we will trigger listeners for all groups of particular user as well
+ if (triggerListenersForGroups)
+ {
+ Collection<Group> groups = orgService.getGroupHandler().findGroupsOfUser(username);
+ for (Group group : groups)
+ {
+ initializer.treatGroup(group, checkFolders);
+ }
+ }
+
+ // Put flag to indicate, that this session is "processed"
+ httpServletRequest.getSession().setAttribute(ATTR_FLAG_NAME, "true");
+ }
+ catch (Exception e)
+ {
+ log.error("Error occured in TriggerInitializerFilter", e);
+ }
+ finally
+ {
+ RequestLifeCycle.end();
+ }
+ }
+
+ // Continue with filter chain
+ filterChain.doFilter(servletRequest, servletResponse);
+ }
+}
Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2012-03-07 10:38:07 UTC (rev 8545)
+++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2012-03-08 13:32:18 UTC (rev 8546)
@@ -45,6 +45,7 @@
<module>scripting</module>
<module>management</module>
<module>identity</module>
+ <module>initializer</module>
</modules>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-03-07 10:38:07 UTC (rev 8545)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-03-08 13:32:18 UTC (rev 8546)
@@ -179,6 +179,10 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.initializer</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
</dependency>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-03-07 10:38:07 UTC (rev 8545)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-03-08 13:32:18 UTC (rev 8546)
@@ -525,6 +525,11 @@
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.initializer</artifactId>
+ <version>5.2.1.ER02-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
<version>5.2.1.ER02-SNAPSHOT</version>
</dependency>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2012-03-07 10:38:07 UTC (rev 8545)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2012-03-08 13:32:18 UTC (rev 8546)
@@ -50,6 +50,10 @@
<!-- <import>war:/conf/security-configuration.xml</import> -->
<import>war:/conf/organization/organization-configuration.xml</import>
+
+ <!-- Uncomment for enable initializer (OrganizationListenersInitializerService and related stuff) -->
+ <!--<import>war:/conf/organization/initializer-configuration.xml</import>-->
+
<import>war:/conf/jcr/component-plugins-configuration.xml</import>
<import>war:/conf/mail/portal-mail-configuration.xml</import>
Added: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/initializer-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/initializer-configuration.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/initializer-configuration.xml 2012-03-08 13:32:18 UTC (rev 8546)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2012, 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.
+ -->
+<configuration>
+
+ <!-- Main configuration of service -->
+ <component>
+ <type>org.exoplatform.core.component.organization.initializer.OrganizationListenersInitializerService</type>
+ <init-params>
+ <value-param>
+ <name>repository</name>
+ <value>repository</value>
+ </value-param>
+ <value-param>
+ <name>workspace</name>
+ <value>portal-system</value>
+ </value-param>
+ <value-param>
+ <name>homePath</name>
+ <value>/</value>
+ </value-param>
+ <value-param>
+ <name>executeAllListenersDuringBoot</name>
+ <value>true</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <!-- Possibility to trigger operations through REST -->
+ <component>
+ <type>org.exoplatform.core.component.organization.initializer.RestOrganizationInitializer</type>
+ </component>
+
+ <!-- Possibility to trigger operations through JMX -->
+ <component>
+ <type>org.exoplatform.core.component.organization.initializer.JMXOrganizationInitializer</type>
+ </component>
+
+ <!-- Listeners for creating marker JCR folders -->
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.organization.OrganizationService</target-component>
+ <component-plugin>
+ <name>organization.initializer.group.event.listener</name>
+ <set-method>addListenerPlugin</set-method>
+ <type>org.exoplatform.core.component.organization.initializer.NewGroupListener</type>
+ <description>description</description>
+ </component-plugin>
+ <component-plugin>
+ <name>organization.initializer.user.event.listener</name>
+ <set-method>addListenerPlugin</set-method>
+ <type>org.exoplatform.core.component.organization.initializer.NewUserListener</type>
+ <description>description</description>
+ </component-plugin>
+ <component-plugin>
+ <name>organization.initializer.membership.event.listener</name>
+ <set-method>addListenerPlugin</set-method>
+ <type>org.exoplatform.core.component.organization.initializer.NewMembershipListener</type>
+ <description>description</description>
+ </component-plugin>
+ <component-plugin>
+ <name>organization.initializer.profile.event.listener</name>
+ <set-method>addListenerPlugin</set-method>
+ <type>org.exoplatform.core.component.organization.initializer.NewProfileListener</type>
+ <description>description</description>
+ </component-plugin>
+ </external-component-plugins>
+
+ <!-- Trigger listeners for particular user after his login -->
+ <external-component-plugins>
+ <target-component>org.exoplatform.web.filter.ExtensibleFilter</target-component>
+ <component-plugin>
+ <name>TriggerInitializerFilter</name>
+ <set-method>addFilterDefinitions</set-method>
+ <type>org.exoplatform.web.filter.FilterDefinitionPlugin</type>
+ <init-params>
+ <object-param>
+ <name>Trigger Initializer filter definition</name>
+ <object type="org.exoplatform.web.filter.FilterDefinition">
+ <field name="filter">
+ <object type="org.exoplatform.core.component.organization.initializer.TriggerInitializerFilter">
+ <field name="checkFolders"><boolean>true</boolean></field>
+ <field name="triggerListenersForGroups"><boolean>true</boolean></field>
+ </object>
+ </field>
+ <field name="patterns">
+ <collection type="java.util.ArrayList" item-type="java.lang.String">
+ <value>
+ <string>/.*</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
+ <!-- Trigger all listeners periodically -->
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.scheduler.JobSchedulerService</target-component>
+ <component-plugin>
+ <name>OrgInitializerCronJob</name>
+ <set-method>addCronJob</set-method>
+ <type>org.exoplatform.services.scheduler.CronJob</type>
+ <description>Initialize added Organization Model objects added by an UIother tha eXo UI</description>
+ <init-params>
+ <properties-param>
+ <name>cronjob.info</name>
+ <description>Invoke initializer periodically</description>
+ <property name="jobName" value="OrgInitializerCronJob"/>
+ <property name="groupName" value="group"/>
+ <property name="job" value="org.exoplatform.core.component.organization.initializer.OrganizationInitializerJob"/>
+ <property name="expression" value="0 45 23 * * ? *"/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
\ No newline at end of file
12 years, 9 months
- 1
- 0
gatein SVN: r8545 - epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-03-07 05:38:07 -0500 (Wed, 07 Mar 2012)
New Revision: 8545
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
Log:
Bug 800175 - TemplateRuntimeException in log when go to Dashboard
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2012-03-07 04:47:08 UTC (rev 8544)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2012-03-07 10:38:07 UTC (rev 8545)
@@ -51,7 +51,7 @@
resolvedLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel());
}
- boolean toolong = (node.getResolvedLabel.length() > 60);
+ boolean toolong = (node.getResolvedLabel().length() > 60);
String label = ( toolong ? EntityEncoder.encode(node.getResolvedLabel().substring(0, 57) + "...") : resolvedLabel);
String title = "";
if(toolong) title = "title='$resolvedLabel'";
12 years, 9 months
- 1
- 0
gatein SVN: r8544 - epp/docs/branches/5.2/Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-03-06 23:47:08 -0500 (Tue, 06 Mar 2012)
New Revision: 8544
Modified:
epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Getting_Started.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Installation_Guide.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
Log:
Incorporated https://bugzilla.redhat.com/show_bug.cgi?id=798839 by adding the Native Components section from EAP docs into guide, and modifying to suit EPP.
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-03-06 17:33:12 UTC (rev 8543)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-03-07 04:47:08 UTC (rev 8544)
@@ -9,7 +9,7 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.1</edition>
- <pubsnumber>7</pubsnumber>
+ <pubsnumber>8</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform. It forms part of the complete document suite along with the <citetitle>User Guide</citetitle> and <citetitle>Reference Guide</citetitle> available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Getting_Started.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Getting_Started.xml 2012-03-06 17:33:12 UTC (rev 8543)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Getting_Started.xml 2012-03-07 04:47:08 UTC (rev 8544)
@@ -10,12 +10,10 @@
<remark>BZ#741683 - Adjusted section to reflect Site Publisher section in this guide now.</remark>
<para>Read the notes below to ensure you choose the correct installation/migration path for your circumstances.
</para>
- <para>It is possible to upgrade from JBoss Enterprise Portal Platform version 5.1.0 or 5.1.1 to JBoss Enterprise Portal Platform &VZ;.
- </para>
- <para>To upgrade, copy any customized configuration files and database settings from your existing JBoss Enterprise Portal Platform installation to the corresponding location of the &VZ; installation.
- </para>
+ <para>You can upgrade from JBoss Enterprise Portal Platform version 5.1.0 or 5.1.1 to JBoss Enterprise Portal Platform &VZ;.
+ Copy any customized configuration files and database settings from your existing JBoss Enterprise Portal Platform installation to the corresponding location of the &VZ; installation.</para>
<para>
- The Site Publisher add-on (commonly referred to as Site Publisher) that is part of the &VZ; release can only be installed onto a <emphasis>clean</emphasis> installation of JBoss Enterprise Portal Platform version 5.1 or later.
+ The Site Publisher add-on (commonly referred to as Site Publisher) that is part of the &VZ; release can only be installed onto a <firstterm>clean</firstterm> installation of JBoss Enterprise Portal Platform version 5.1 or later.
</para>
<para>If you already have a clean installation of JBoss Enterprise Portal Platform, you can go directly to <xref linkend="Site_Publisher_Installation"/>.</para>
</section>
@@ -61,7 +59,7 @@
</para>
<variablelist>
<varlistentry>
- <term> Disk Space: 1.5 GB</term>
+ <term> Disk Space: 1.0 GB</term>
<listitem>
<para>
The default server log file storage configuration is 500MB.
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Installation_Guide.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Installation_Guide.xml 2012-03-06 17:33:12 UTC (rev 8543)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Installation_Guide.xml 2012-03-07 04:47:08 UTC (rev 8544)
@@ -9,6 +9,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Getting_Started.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Installation_With_ZIP_Download.xml" encoding="UTF-8"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Native_Components.xml" encoding="UTF-8"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="SP_Installation.xml" encoding="UTF-8"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Post_Installation.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Test_Your_Installation.xml"/>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml 2012-03-06 17:33:12 UTC (rev 8543)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Installation_With_ZIP_Download.xml 2012-03-07 04:47:08 UTC (rev 8544)
@@ -117,10 +117,11 @@
with an installation of JBoss Enterprise Portal Platform in its default configuration.</para>
</formalpara>
</step>
-<!--<step>
- <title>Optional: Install Native Components</title>
- <para>Refer to <xref linkend="Install_Native_Components"/> for Native Component installation instructions.</para>
-</step>--> <step>
+ <step>
+ <title>Optional: Install Native Components</title>
+ <para>Refer to <xref linkend="Install_Native_Components"/> for Native Component installation instructions.</para>
+ </step>
+ <step>
<title>Optional: Site Publisher</title>
<para>If you need to install Site Publisher, complete the tasks in to <xref linkend="Site_Publisher_Installation"/>.</para>
</step>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml 2012-03-06 17:33:12 UTC (rev 8543)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Native_Components.xml 2012-03-07 04:47:08 UTC (rev 8544)
@@ -2,27 +2,49 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
]>
<chapter id="Install_Native_Components">
- <title>Install Native Components</title>
- <formalpara>
- <title>The Native Components Package</title>
- <para>
- The Native Components package is an optional component for the JBoss Enterprise Application Platform that incorporates
- native operating system components and connectors for web servers, including OpenSSL, JBoss Native, mod_jk,
- mod_cluster, NSAPI for Solaris, ISAPI for Windows, HornetQ LibAIO Native for Red Hat Enterprise Linux.
- </para>
- </formalpara>
- <para>
- Installing JBoss Native results in higher server performance, as native operating system
+ <title><remark>BZ#798839 </remark>Install Native Components</title>
+ <remark>BZ#798839 - 20120307 - Converted this chapter from the EAP Installation Guide.</remark>
+ <para/>
+ <para>The Native Components package is an optional JBoss Enterprise Application Platform package that incorporates
+ native operating system components and connectors for web servers including:</para>
+ <itemizedlist>
+ <listitem>
+ <para>OpenSSL</para>
+ </listitem>
+ <listitem>
+ <para>JBoss Native</para>
+ </listitem>
+ <listitem>
+ <para>mod_jk</para>
+ </listitem>
+ <listitem>
+ <para>mod_cluster</para>
+ </listitem>
+ <listitem>
+ <para>NSAPI for Solaris</para>
+ </listitem>
+ <listitem>
+ <para>ISAPI for Windows</para>
+ </listitem>
+ <listitem>
+ <para>HornetQ LibAIO Native for Red Hat Enterprise Linux</para>
+ </listitem>
+ </itemizedlist>
+ <para>Installing JBoss Native can result in higher server performance, as native operating system
code becomes available for the server to optimize tasks.
- </para>
- <para>
- For more information on configuring the web server connectors, refer to the JBoss Enterprise Application Platform
+ <xref linkend="exam-Native_Web_vs_Java_IO"/> describes a scenario where Native Components perform better over standard components.</para>
+ <remark>BZ#798839 - 20120307 - Added this example based on peformance info from Andrig Miller, as recorded in the bug.</remark>
+ <example id="exam-Native_Web_vs_Java_IO">
+ <title>Native Web Connector vs Java I/O</title>
+ <para>If your implementation has many thousands of users, all with active sessions, but only 20% of all active users are making concurrent requests, the native web connector is the correct choice. </para>
+ <para>If your implementation has higher concurrent user demands, the Java I/O connector is a better choice. However, the Java I/O connector has a limit to the number of clients and compensates for this limitation by consuming CPU resources faster than the native web connector.</para>
+ </example>
+ <para>For more information on configuring the web server connectors, refer to the JBoss Enterprise Application Platform
<citetitle>HTTP Connectors Load Balancing Guide</citetitle>.</para>
<itemizedlist>
<title>Native Components Manifest</title>
<listitem>
- <para>
- JBoss Native consists of the Apache Portable Runtime (APR), OpenSSL and Tomcat Native (TC-native);
+ <para>JBoss Native consists of the Apache Portable Runtime (APR), OpenSSL and Tomcat Native (TC-native);
</para>
<itemizedlist>
<listitem>
@@ -61,13 +83,15 @@
</para>
</listitem>
<listitem>
- <para>
- <literal>ISAPI</literal> is a connector for the Microsoft IIS web server.
+ <para><literal>ISAPI</literal> is a connector for the Microsoft IIS web server.
</para>
</listitem>
<listitem>
- <para>
- HornetQ LibAIO is used as a bridge between HornetQ and Linux LibAIO. It is used in HornetQ's high performance journal, when configured.
+ <remark>BZ#798839 - 20120307 - Added this as part of the manifest, as it wasn't declared in the EAP version (NSAPI is now covered in the HTTP Connectors Guide for EAP).</remark>
+ <para><literal>NSAPI</literal> is a connector for the Netscape web server.</para>
+ </listitem>
+ <listitem>
+ <para>HornetQ <literal>LibAIO</literal> is used as a bridge between HornetQ and Linux LibAIO. It is used in HornetQ's high performance journal, when configured.
</para>
</listitem>
</itemizedlist>
@@ -84,7 +108,7 @@
</para>
<programlisting>WARN [AprLifecycleListener] The Apache Tomcat Native library which allows optimal performance
in production environments was not found on the java.library.path:
-/home/eapuser/jboss-eap-5.1/native/lib.
+/opt/user/jboss-epp-<replaceable>VERSION</replaceable>/native/lib.
</programlisting>
</section>
<section>
@@ -100,4 +124,143 @@
during the installation.
</para>
</section>
+ <section id="Native_Components_Download">
+ <title>Download</title>
+ <remark>BZ#798839 - 20120307 - Adapted the EAP instructions to cater for the fact no native binaries are currently included in EPP.</remark>
+ <para>Read this section to learn how to download the required native libraries for JBoss Enterprise Portal Platform.</para>
+ <task id="task-Download_Native_Files">
+ <title>Task: Download Native Files</title>
+ <tasksummary>
+ <para>Complete this task to download the native binary Zip archives from the Red Hat Customer Portal.</para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>You have a login to the Red Hat Customer Portal (
+ <ulink url="http://access.redhat.com">http://access.redhat.com</ulink>
+ ).
+ </para>
+ </listitem>
+ <listitem>
+ <para>You have a valid JBoss Enterprise Portal Platform subscription, with entitlements to JBoss Enterprise Application Platform native binaries. </para>
+ </listitem>
+ <listitem>
+ <para>You have reviewed the JBoss Enterprise Portal Platform <citetitle>Release Notes</citetitle> to identify which version of JBoss Enterprise Application Platform is included in the portal version you are installing. </para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Open
+ <ulink url="http://access.redhat.com"/>
+ in a web browser.
+ </para>
+ </step>
+ <step>
+ <para>Click the
+ <guibutton>Downloads</guibutton>
+ option in the menu across the top of the page.
+ </para>
+ </step>
+ <step>
+ <para>Click on
+ <guibutton>Download your software</guibutton>
+ in the list under JBoss Enterprise Middleware.
+ </para>
+ </step>
+ <step>
+ <para>If you are not already authenticated, enter your login information.</para>
+ <formalpara>
+ <title>Result:</title>
+ <para>You are taken to the Software Downloads page.</para>
+ </formalpara>
+ </step>
+ <step>
+ <para>Select
+ <literal>Application Platform</literal>
+ from either the drop-down box or the menu on the left.
+ </para>
+ <formalpara>
+ <title>Result:</title>
+ <para>You are presented with a list of file downloads for the latest version of JBoss Enterprise Application Platform.</para>
+ </formalpara>
+ </step>
+ <step>
+ <para>From the Version drop-down, select the version number specified in the Portal <citetitle>Release Notes</citetitle>.</para>
+ <formalpara>
+ <title>Result:</title>
+ <para>You are presented with a list of file downloads for the applicable version of JBoss Enterprise Application Platform, as it relates to JBoss Enterprise Portal Platform.</para>
+ </formalpara>
+ </step>
+ <step>
+ <para>Click the
+ <filename>JBoss EAP <replaceable>VERSION</replaceable> Native Components for <replaceable>OPERATING_SYSTEM</replaceable><replaceable> OS_ARCHITECTURE</replaceable> </filename>
+ download link that corresponds with your native operating system.</para>
+ </step>
+ <step>
+ <para>Click the <guibutton>Download</guibutton> link to start the native components download.</para>
+ </step>
+ </procedure>
+ </task>
+ </section>
+ <section id="Native_Components_Install">
+ <title>Install</title>
+ <remark>BZ#798839 - 20120307 - Converted this chapter from the EAP Installation Guide to cover EPP installation of EAP native binaries.</remark>
+ <para>Read this section to learn how to install the native libraries for JBoss Enterprise Portal Platform.</para>
+ <task>
+ <title>Install Native Components</title>
+ <tasksummary>
+ <para>Complete this task to install the native components for JBoss Enterprise Portal Platform.</para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>Complete <xref linkend="task-Download_Native_Files"/>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Open the <filename>JBoss EAP <replaceable>VERSION</replaceable> Native Components for <replaceable>OPERATING_SYSTEM</replaceable><replaceable> OS_ARCHITECTURE</replaceable></filename> Zip archive.</para>
+ </step>
+ <step>
+ <para>Extract the <filename>native</filename> directory from the zip archive into the
+ <filename>
+ <replaceable>JBOSS_HOME</replaceable>
+ </filename> directory, so the <filename>native</filename> directory is at the same directory level as
+ the <filename>jboss-as</filename> directory.
+ </para>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>You have installed the native components into the correct directory. </para>
+ </formalpara>
+ </step>
+ </procedure>
+ <taskrelated>
+ <title>Related Information</title>
+ <itemizedlist>
+ <listitem>
+ <para>Refer to <xref linkend="task-Install_The_Platform"/> to verify all other base installation steps are complete.</para>
+ </listitem>
+ <listitem>
+ <para>Refer to <xref linkend="Post_Installation_Configuration"/> to ensure you meet all post installation requirements.</para>
+ </listitem>
+ </itemizedlist>
+ </taskrelated>
+ </task>
+ <para>Once you have completed all post installation configuration requirements, you can verify native components are loaded during server startup by reviewing the server startup terminal information.</para>
+ <screen>12:12:29,826 INFO [ServerInfo] VM arguments: -Dprogram.name=run.sh -Xms1303m -Xmx1303m
+ -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000
+ -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true
+ -Djava.protocol.handler.pkgs=org.jboss.handlers.stub -Djava.net.preferIPv4Stack=true
+ -Djava.library.path=/opt/user/jboss-epp-<replaceable>VERSION</replaceable>/native/lib64
+ -Djava.endorsed.dirs=/opt/user/jboss-epp-<replaceable>VERSION</replaceable>/jboss-as/lib/endorsed</screen>
+ <para>The option <literal>-Djava.library.path=/opt/user/jboss-epp-<replaceable>VERSION</replaceable>/native/lib64</literal> shows that the
+ server is detecting and loading the Native libraries.</para>
+ </section>
</chapter>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-03-06 17:33:12 UTC (rev 8543)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-03-07 04:47:08 UTC (rev 8544)
@@ -9,6 +9,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-8</revnumber>
+ <date>Wed Mar 7 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Incorporated https://bugzilla.redhat.com/show_bug.cgi?id=798839 by adding the Native Components section from EAP docs into guide, and modifying to suit EPP. </member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.1-7</revnumber>
<date>Wed Feb 29 2012</date>
<author>
12 years, 9 months
- 1
- 0
gatein SVN: r8543 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/login/jsp.
by do-not-reply＠jboss.org
Author: theute
Date: 2012-03-06 12:33:12 -0500 (Tue, 06 Mar 2012)
New Revision: 8543
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/login/jsp/login.jsp
Log:
Bug 793686 - (JBEPP-762) Sign-in button: Clickable area is much wider than the visible button
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/login/jsp/login.jsp
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/login/jsp/login.jsp 2012-03-06 17:32:43 UTC (rev 8542)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/login/jsp/login.jsp 2012-03-06 17:33:12 UTC (rev 8543)
@@ -93,14 +93,14 @@
<td><%=res.getString("UILoginForm.label.RememberOnComputer")%></td>
</tr>
</table>
- <div id="UIPortalLoginFormAction" class="LoginButton" onclick="login();">
+ <div id="UIPortalLoginFormAction" class="LoginButton">
<table class="LoginButtonContainer">
<tr>
<td class="Button">
<div class="LeftButton">
<div class="RightButton">
<div class="MiddleButton">
- <a href="#"><%=res.getString("UILoginForm.label.Signin")%></a>
+ <a href="#" onclick="login();"><%=res.getString("UILoginForm.label.Signin")%></a>
</div>
</div>
</div>
12 years, 9 months
- 1
- 0