[gatein-commits] gatein SVN: r8683 - in epp/portal/tags: EPP_5_2_1_CR02 and 112 other directories.

Author: hfnukal Date: 2012-04-10 10:31:28 -0400 (Tue, 10 Apr 2012) New Revision: 8683 Added: epp/portal/tags/EPP_5_2_1_CR02/ epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java Removed: epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java Modified: epp/portal/tags/EPP_5_2_1_CR02/component/ epp/portal/tags/EPP_5_2_1_CR02/component/application-registry/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/common/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/identity/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/initializer/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/management/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/pc/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/portal/ epp/portal/tags/EPP_5_2_1_CR02/component/portal/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/portal/src/main/java/org/ epp/portal/tags/EPP_5_2_1_CR02/component/resources/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/scripting/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/test/core/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/test/jcr/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/test/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/web/api/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/web/controller/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/web/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/web/resources/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/web/security/pom.xml epp/portal/tags/EPP_5_2_1_CR02/component/web/server/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/examples/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/gatein-management/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/portletbridge/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/integration.war/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-core/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-doc/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-jcr/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-junit/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-kernel/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-parent/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-ws/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-common/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-dep/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-examples/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-jon-plugin/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-management/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-mop/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-parent/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-pc/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-portal/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-shindig/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-simplecaptcha/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-sso/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-wci/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-wsrp/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-eppsp/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-picketlink-idm/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-portletbridge/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/mead.parent/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/pom.xml epp/portal/tags/EPP_5_2_1_CR02/distribution/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/extension/config/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/extension/ear/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/extension/jar/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/extension/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/extension/war/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portal/config/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portal/ear/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portal/jar/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portal/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portal/rest-war/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portal/war/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/api/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/jsfhellouser/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/jsphellouser/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/simplesthelloworld/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/struts-jpetstore/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/skins/pom.xml epp/portal/tags/EPP_5_2_1_CR02/examples/skins/simpleskin/pom.xml epp/portal/tags/EPP_5_2_1_CR02/gadgets/core/pom.xml epp/portal/tags/EPP_5_2_1_CR02/gadgets/eXoGadgets/pom.xml epp/portal/tags/EPP_5_2_1_CR02/gadgets/gwtGadgets/pom.xml epp/portal/tags/EPP_5_2_1_CR02/gadgets/pom.xml epp/portal/tags/EPP_5_2_1_CR02/gadgets/server/pom.xml epp/portal/tags/EPP_5_2_1_CR02/pom.xml epp/portal/tags/EPP_5_2_1_CR02/portlet/dashboard/pom.xml epp/portal/tags/EPP_5_2_1_CR02/portlet/exoadmin/pom.xml epp/portal/tags/EPP_5_2_1_CR02/portlet/pom.xml epp/portal/tags/EPP_5_2_1_CR02/portlet/web/pom.xml epp/portal/tags/EPP_5_2_1_CR02/server/jboss/patch-ear/pom.xml epp/portal/tags/EPP_5_2_1_CR02/server/jboss/plugin/pom.xml epp/portal/tags/EPP_5_2_1_CR02/server/jboss/pom.xml epp/portal/tags/EPP_5_2_1_CR02/server/pom.xml epp/portal/tags/EPP_5_2_1_CR02/starter/ear/pom.xml epp/portal/tags/EPP_5_2_1_CR02/starter/jar/pom.xml epp/portal/tags/EPP_5_2_1_CR02/starter/pom.xml epp/portal/tags/EPP_5_2_1_CR02/starter/war/pom.xml epp/portal/tags/EPP_5_2_1_CR02/testsuite/pom.xml epp/portal/tags/EPP_5_2_1_CR02/testsuite/selenium-snifftests/pom.xml epp/portal/tags/EPP_5_2_1_CR02/testsuite/webuibasedsamples/pom.xml epp/portal/tags/EPP_5_2_1_CR02/web/eXoResources/pom.xml epp/portal/tags/EPP_5_2_1_CR02/web/pom.xml epp/portal/tags/EPP_5_2_1_CR02/web/portal/pom.xml epp/portal/tags/EPP_5_2_1_CR02/web/rest/pom.xml epp/portal/tags/EPP_5_2_1_CR02/webui/core/pom.xml epp/portal/tags/EPP_5_2_1_CR02/webui/dashboard/pom.xml epp/portal/tags/EPP_5_2_1_CR02/webui/eXo/pom.xml epp/portal/tags/EPP_5_2_1_CR02/webui/framework/pom.xml epp/portal/tags/EPP_5_2_1_CR02/webui/pom.xml epp/portal/tags/EPP_5_2_1_CR02/webui/portal/pom.xml epp/portal/tags/EPP_5_2_1_CR02/webui/portlet/pom.xml epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/ epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-component/pom.xml epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-config/pom.xml epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-ear-as5/pom.xml epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-ear/pom.xml epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-war/pom.xml epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/pom.xml Log: Release EPP 5.2.1.CR02 Property changes on: epp/portal/tags/EPP_5_2_1_CR02 ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: svn:mergeinfo + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4868,4875,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/xss:7377-7595,7597 /portal/branches/xss-issues:7350-7351,7358 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6665,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7741,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072 Property changes on: epp/portal/tags/EPP_5_2_1_CR02/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4868,4875,4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4868,4875,4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6665,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072 Modified: epp/portal/tags/EPP_5_2_1_CR02/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/application-registry/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/common/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/identity/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/initializer/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/initializer/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/initializer/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -3,7 +3,7 @@ <parent> <artifactId>exo.portal.component</artifactId> <groupId>org.exoplatform.portal</groupId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/management/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/pc/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.component</artifactId> Property changes on: epp/portal/tags/EPP_5_2_1_CR02/component/portal ___________________________________________________________________ Modified: svn:mergeinfo - /portal/branches/branch-GTNPORTAL-1592/component/portal:4868,4875 /portal/trunk:7451 /portal/trunk/component/portal:7085,7409,7412,7451,7500,7570-7571,7573,7577,7614-7615,7695-7696,7701-7704,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072 + /portal/branches/branch-GTNPORTAL-1592/component/portal:4868,4875 /portal/trunk:7451 /portal/trunk/component/portal:6665,7085,7409,7412,7451,7500,7570-7571,7573,7577,7614-7615,7695-7696,7701-7704,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072 Modified: epp/portal/tags/EPP_5_2_1_CR02/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/portal/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Property changes on: epp/portal/tags/EPP_5_2_1_CR02/component/portal/src/main/java/org ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4875,4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072 /portal/trunk/src/main/java/org:7451 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868 /portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4875,4894 /portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765 /portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871 /portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916 /portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6665,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072 /portal/trunk/src/main/java/org:7451 Modified: epp/portal/tags/EPP_5_2_1_CR02/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/resources/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/scripting/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/test/core/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/test/jcr/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/test/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/web/api/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/web/controller/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/web/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/web/resources/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/web/security/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/component/web/server/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/examples/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/gatein-management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/gatein-management/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <groupId>org.jboss.portal</groupId> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/portletbridge/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>gatein</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>integration</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/jboss-epp/serverAddon/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-core/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-doc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-doc/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-jcr/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-junit/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-junit/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-kernel/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-kernel/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-parent/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-parent/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-ws/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/exo-ws/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-common/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-dep/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-dep/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-examples/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-examples/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-jon-plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-jon-plugin/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-jon-plugin/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-management/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-mop/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-mop/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-parent/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-parent/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-pc/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-portal/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-shindig/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-shindig/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-simplecaptcha/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-sso/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-sso/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-wci/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-wci/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-wsrp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/gatein-wsrp/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-eppsp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-eppsp/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-eppsp/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-picketlink-idm/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/jboss-portletbridge/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/mead.parent/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/mead.parent/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> - <version>5.2.1.GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <artifactId>mead-tools</artifactId> <relativePath>../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/mead-tools/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <groupId>org.exoplatform.portal.mead</groupId> @@ -55,7 +55,7 @@ </build> <properties> - <gatein.tag>EPP_5.2.1.GA-SNAPSHOT</gatein.tag> + <gatein.tag>EPP_5_2_1_CR02</gatein.tag> <!-- Ant properties --> <ant.build.file>build.xml</ant.build.file> Modified: epp/portal/tags/EPP_5_2_1_CR02/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/distribution/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/extension/config/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/extension/ear/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,17 +38,17 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <scope>provided</scope> <exclusions> <exclusion> @@ -76,7 +76,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <type>war</type> </dependency> <dependency> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/extension/jar/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/extension/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/extension/war/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portal/config/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portal/ear/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,17 +38,17 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <scope>provided</scope> <exclusions> <exclusion> @@ -76,13 +76,13 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <type>war</type> </dependency> <dependency> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portal/jar/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portal/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portal/rest-war/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portal/war/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/api/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/jsfhellouser/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/jsphellouser/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/simplesthelloworld/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/portlets/struts-jpetstore/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/skins/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/examples/skins/simpleskin/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/gadgets/core/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/gadgets/eXoGadgets/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/gadgets/gwtGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/gadgets/gwtGadgets/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -28,7 +28,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.gwtGadgets</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/gadgets/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/gadgets/server/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <packaging>pom</packaging> <name>EPP GateIn - Portal - ${project.version}</name> @@ -79,9 +79,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/ta... - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/port... - <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/EPP_5.2.1.G... + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/ta... + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/port... + <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/EPP_5_2_1_C... </scm> <modules> @@ -468,79 +468,79 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.initializer</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -550,68 +550,68 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <type>test-jar</type> </dependency> <dependency> @@ -628,7 +628,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> <!-- Chromattic --> Modified: epp/portal/tags/EPP_5_2_1_CR02/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/portlet/dashboard/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/portlet/exoadmin/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/portlet/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/portlet/web/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/server/jboss/patch-ear/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/server/jboss/plugin/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/server/jboss/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/server/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/starter/ear/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,7 +38,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5_2_1_CR02/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/starter/jar/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_1_CR02/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/starter/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/starter/war/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -51,7 +51,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.jar</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </dependency> </dependencies> </project> Modified: epp/portal/tags/EPP_5_2_1_CR02/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/testsuite/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/testsuite/selenium-snifftests/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/testsuite/webuibasedsamples/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/web/eXoResources/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/web/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/web/portal/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/web/rest/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/core/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/dashboard/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/eXo/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/framework/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/portal/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2012-04-10 14:31:28 UTC (rev 8683) @@ -1,869 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.webui.application; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.portlet.PortletMode; -import javax.portlet.WindowState; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.namespace.QName; - -import org.exoplatform.portal.Constants; -import org.exoplatform.portal.application.PortalRequestContext; -import org.exoplatform.portal.webui.page.UIPage; -import org.exoplatform.portal.webui.page.UIPageBody; -import org.exoplatform.portal.webui.portal.UIPortal; -import org.exoplatform.portal.webui.util.Util; -import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; -import org.exoplatform.portal.webui.workspace.UIPortalApplication; -import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.webui.core.UIComponent; -import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.Event.Phase; -import org.exoplatform.webui.event.EventListener; -import org.gatein.common.util.MultiValuedPropertyMap; -import org.gatein.common.util.ParameterValidation; -import org.gatein.pc.api.Mode; -import org.gatein.pc.api.ParametersStateString; -import org.gatein.pc.api.PortletContext; -import org.gatein.pc.api.StateString; -import org.gatein.pc.api.StatefulPortletContext; -import org.gatein.pc.api.invocation.ActionInvocation; -import org.gatein.pc.api.invocation.EventInvocation; -import org.gatein.pc.api.invocation.ResourceInvocation; -import org.gatein.pc.api.invocation.response.ContentResponse; -import org.gatein.pc.api.invocation.response.ErrorResponse; -import org.gatein.pc.api.invocation.response.HTTPRedirectionResponse; -import org.gatein.pc.api.invocation.response.PortletInvocationResponse; -import org.gatein.pc.api.invocation.response.SecurityErrorResponse; -import org.gatein.pc.api.invocation.response.SecurityResponse; -import org.gatein.pc.api.invocation.response.UpdateNavigationalStateResponse; - -/** May 29, 2006 */ -public class UIPortletActionListener -{ - - public static final String PORTLET_EVENTS = "PortletEvents"; - - protected static Log log = ExoLogger.getLogger("portal:UIPortletActionListener"); - - /** - * The process action listener is called when an ActionURL generated by the portlet container has been invoked by the - * client - * <p/> - * The call is delegated to the portlet container iteself using the method portletContainer.processAction(...). It - * returns an object of type ActionOutput that contains several information such as the next window state and portlet - * modes (if they have to change) as well as a list of Events to be broadcasted to the other portlets located in the - * same portal page - */ - static public class ProcessActionActionListener<S, C extends Serializable, I> extends EventListener<UIPortlet<S, C>> - { - public void execute(Event<UIPortlet<S, C>> event) throws Exception - { - UIPortlet<S, C> uiPortlet = event.getSource(); - PortalRequestContext prcontext = (PortalRequestContext)event.getRequestContext(); - - // set the public render parameters from the request before creating the invocation - HttpServletRequest request = prcontext.getRequest(); - setupPublicRenderParams(uiPortlet, request.getParameterMap()); - - // set the navigational state - String navState = prcontext.getRequestParameter(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME); - if (navState != null) - { - uiPortlet.setNavigationalState(ParametersStateString.create(navState)); - } - - // - ActionInvocation actionInvocation = uiPortlet.create(ActionInvocation.class, prcontext); - if (actionInvocation == null) - { - return; - } - // - PortletInvocationResponse portletResponse = uiPortlet.invoke(actionInvocation); - - // deal with potential portlet context modifications - ExoPortletInstanceContext instanceCtx = (ExoPortletInstanceContext)actionInvocation.getInstanceContext(); - if (instanceCtx.getModifiedContext() != null) - { - StatefulPortletContext<C> updatedCtx = (StatefulPortletContext<C>)instanceCtx.getModifiedContext(); - C portletState = uiPortlet.getModifiedState(updatedCtx); - uiPortlet.update(portletState); - } - else - { - // todo: fix me as this shouldn't probably be done only for the WSRP case - PortletContext clonedContext = instanceCtx.getClonedContext(); - if (clonedContext != null) - { - C state = uiPortlet.getClonedState(clonedContext); - uiPortlet.update(state); - } - } - - if (portletResponse instanceof UpdateNavigationalStateResponse) - { - handleUpdateNavigationalStateResponse((UpdateNavigationalStateResponse)portletResponse, uiPortlet, prcontext); - } - else if (portletResponse instanceof HTTPRedirectionResponse) - { - handleRedirectionResponse((HTTPRedirectionResponse)portletResponse, prcontext.getResponse()); - } - else if (portletResponse instanceof ErrorResponse) - { - handleErrorResponse((ErrorResponse)portletResponse); - } - else if (portletResponse instanceof SecurityResponse) - { - handleSecurityResponse((SecurityResponse)portletResponse); - } - else - { - throw new Exception("Unexpected response type [" + portletResponse + "]. Expected an UpdateNavigationResponse" + - ", a HTTPRedirectionResponse or an ErrorResponse."); - } - } - - - private void handleRedirectionResponse(HTTPRedirectionResponse redirectionResponse, HttpServletResponse response) throws IOException - { - String redirectionURL = redirectionResponse.getLocation(); - response.sendRedirect(redirectionURL); - } - - private void handleUpdateNavigationalStateResponse(UpdateNavigationalStateResponse navStateResponse, UIPortlet<S, C> uiPortlet, PortalRequestContext prcontext) throws Exception - { - /* - * Update the portlet window state according to the action output - * information - * - * If the current node is displaying a usual layout page, also tells the - * page which portlet to render or not when the state is maximized - */ - // Note: we should only update the WindowState if the UpdateNavigationalStateResponse.getWindowState is not null, - // otherwise it means the WindowState has not changed and we should use the current value. - if (navStateResponse.getWindowState() != null) - { - WindowState state = new WindowState(getWindowStateOrDefault(navStateResponse)); - setNextState(uiPortlet, state); - } - - // update the portlet with the next mode to display - // Note: we should only update the Mode if the UpdateNavigationalStateResponse.getMode is not null, - // otherwise it means the mode has not changed and we should use the current value. - if (navStateResponse.getMode() != null) - { - PortletMode mode = new PortletMode(getPortletModeOrDefault(navStateResponse)); - setNextMode(uiPortlet, mode); - } - - /* - * Cache the render parameters in the UI portlet component to handle the - * navigational state. Each time a portlet is rendered (except using - * directly a RenderURL) those parameters are added to the portlet request - * to preserve the portlet state among all the portal clicks - */ - - // - StateString navigationalState = navStateResponse.getNavigationalState(); - if (navigationalState != null) - { - uiPortlet.setNavigationalState(navigationalState); - } - - // update the public render parameters with the changes from the invocation - setupPublicRenderParams(uiPortlet, navStateResponse.getPublicNavigationalStateUpdates()); - - /* - * Handle the events returned by the action output and broadcast a new UI - * event to the ProcessEventsActionListener that will then target the - * portlet container service directly - */ - - //TODO: (mwringe) add this to the UpdateNavigationStateResponse.Event class instead of here - class PortletEvent implements javax.portlet.Event - { - QName qName; - - Serializable value; - - public PortletEvent(QName qName, Serializable value) - { - this.qName = qName; - this.value = value; - } - - public String getName() - { - return qName.getLocalPart(); - } - - public QName getQName() - { - return qName; - } - - public Serializable getValue() - { - return value; - } - } - - List<UpdateNavigationalStateResponse.Event> nsEvents = navStateResponse.getEvents(); - List<javax.portlet.Event> events = new ArrayList<javax.portlet.Event>(nsEvents.size()); - if (nsEvents != null && !nsEvents.isEmpty()) - { - for (UpdateNavigationalStateResponse.Event nsEvent : nsEvents) - { - if (uiPortlet.supportsPublishingEvent(nsEvent.getName())) - { - javax.portlet.Event portletEvent = new PortletEvent(nsEvent.getName(), nsEvent.getPayload()); - events.add(portletEvent); - } - } - } - - if (events != null) - { - prcontext.setAttribute(PORTLET_EVENTS, new EventsWrapper(events)); - uiPortlet.createEvent("ProcessEvents", Phase.PROCESS, prcontext).broadcast(); - } - - } - - private void handleErrorResponse(ErrorResponse response) throws Exception - { - throw (Exception)response.getCause(); - } - - private void handleSecurityResponse(SecurityResponse response) throws Exception - { - if (response instanceof SecurityErrorResponse) - { - SecurityErrorResponse securityErrorResponse = (SecurityErrorResponse)response; - throw new Exception("SecurityErrorResponse Returned while trying to process portlet action. ", securityErrorResponse.getThrowable()); - } - else - { - throw new Exception("Security Response of type " + response.getClass() + " encountered while trying to process portlet action."); - } - } - } - - /** - * This method is used to set the next portlet window state if this one needs to be modified because of the incoming - * request - */ - public static void setNextState(UIPortlet uiPortlet, WindowState state) - { - if (state != null) - { - UIPage uiPage = uiPortlet.getAncestorOfType(UIPage.class); - if (WindowState.MAXIMIZED.equals(state)) - { - uiPortlet.setCurrentWindowState(WindowState.MAXIMIZED); - if (uiPage != null) - { - uiPage.setMaximizedUIPortlet(uiPortlet); - } - } - else if (WindowState.MINIMIZED.equals(state)) - { - uiPortlet.setCurrentWindowState(WindowState.MINIMIZED); - if (uiPage != null) - { - uiPage.setMaximizedUIPortlet(null); - } - } - else - { - uiPortlet.setCurrentWindowState(WindowState.NORMAL); - if (uiPage != null) - { - uiPage.setMaximizedUIPortlet(null); - } - } - } - } - - /** This method is used to set the next portlet mode if this one needs to be modified because of the incoming request */ - public static void setNextMode(UIPortlet uiPortlet, PortletMode portletMode) - { - if (portletMode != null) - { - if (portletMode.equals(PortletMode.HELP)) - { - uiPortlet.setCurrentPortletMode(PortletMode.HELP); - } - else if (portletMode.equals(PortletMode.EDIT)) - { - uiPortlet.setCurrentPortletMode(PortletMode.EDIT); - } - else - { - uiPortlet.setCurrentPortletMode(PortletMode.VIEW); - } - } - } - - /** - * The serveResource() method defined in the JSR 286 specs has several goals: - provide binary output like images to - * be displayed in the portlet (in the previous spec - JSR 168 - a servlet was needed) - provide text output that - * does not impact the entire portal rendering, it is for instance usefull when dealing with Javascript to return - * some JSON structures - * <p/> - * The method delegates the call to the portlet container serverResource method after filling the ResourceInput - * object with the current request state. - * <p/> - * This returns a ResourceOutput object that can content binary or text contentType - * <p/> - * Finally the content is set in the portal response writer or outputstream depending on the type; the - * processRender() method of the portal is not called as we set the response as complete - */ - static public class ServeResourceActionListener<S, C extends Serializable, I> extends EventListener<UIPortlet<S, C>> - { - public void execute(Event<UIPortlet<S, C>> event) throws Exception - { - UIPortlet<S, C> uiPortlet = event.getSource(); - log.trace("Serve Resource for portlet: " + uiPortlet.getPortletContext()); - String resourceId = null; - - try - { - PortalRequestContext context = (PortalRequestContext)event.getRequestContext(); - HttpServletResponse response = context.getResponse(); - - //Set the NavigationalState - String navState = context.getRequestParameter(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME); - if (navState != null) - { - uiPortlet.setNavigationalState(ParametersStateString.create(navState)); - } - - // - ResourceInvocation resourceInvocation = uiPortlet.create(ResourceInvocation.class, context); - - // set the resourceId to be used in case of a problem - resourceId = resourceInvocation.getResourceId(); - - // - PortletInvocationResponse portletResponse = uiPortlet.invoke(resourceInvocation); - - // todo: handle the error response better than this. - if (!(portletResponse instanceof ContentResponse)) - { - if (portletResponse instanceof ErrorResponse) - { - ErrorResponse errorResponse = (ErrorResponse)portletResponse; - if (errorResponse.getCause() != null) - { - throw (Exception)errorResponse.getCause(); - } - else if (errorResponse.getMessage() != null) - { - throw new Exception("Received an error response with message : " + errorResponse.getMessage()); - } - else - { - throw new Exception("Received an error response."); - } - - } - else - { - throw new Exception("Unexpected response type [" + portletResponse - + "]. Expected a ContentResponse or an ErrorResponse."); - } - } - - ContentResponse piResponse = (ContentResponse)portletResponse; - - // - //Manage headers - if (piResponse.getProperties() != null && piResponse.getProperties().getTransportHeaders() != null) - { - MultiValuedPropertyMap<String> transportHeaders = piResponse.getProperties().getTransportHeaders(); - Map<String, String> headers = new HashMap<String, String>(); - - for (String key : transportHeaders.keySet()) - { - for (String value : transportHeaders.getValues(key)) - { - headers.put(key, value); - } - } - context.setHeaders(headers); - } - - String contentType = piResponse.getContentType(); - - if (contentType == null) - { - return; - } - - log.trace("Try to get a resource of type: " + contentType + " for the portlet: " - + uiPortlet.getPortletContext()); - response.setContentType(contentType); - if (piResponse.getChars() != null) - { - OutputStream stream = response.getOutputStream(); - stream.write(piResponse.getChars().getBytes(response.getCharacterEncoding())); - } - else - { - if (piResponse.getBytes() != null) - { - OutputStream stream = response.getOutputStream(); - stream.write(piResponse.getBytes()); - } - else - { - if (piResponse.getChars() != null) - { - log.error("Received a content type of " + contentType + " but it contains no bytes of data. Chars were unexpectantly returned instead : " + piResponse.getChars()); - } - else - { - log.error("Received a content type of " + contentType + " but it contains no bytes of data."); - } - } - - - } - context.getResponse().flushBuffer(); - - } - catch (Exception e) - { - log.error("Problem while serving resource " + (resourceId != null ? resourceId : "") + " for the portlet: " + uiPortlet.getPortletContext().getId(), e); - } - finally - { - /** - * The resource method does not need to go through the render phase - */ - event.getRequestContext().setResponseComplete(true); - } - } - } - - /** - * Process Events sent by the portlet API during the processAction() and serverResource() methods defined in Portlet - * API 2.0 (JSR 286) - */ - static public class ProcessEventsActionListener extends EventListener<UIPortlet> - { - public void execute(Event<UIPortlet> event) throws Exception - { - UIPortlet uiPortlet = event.getSource(); - PortalRequestContext context = (PortalRequestContext)event.getRequestContext(); - List<UIPortlet> portletInstancesInPage = new ArrayList<UIPortlet>(); - // UIPortalApplication uiPortal = uiPortlet.getAncestorOfType(UIPortalApplication.class); - UIPortalApplication uiPortal = (UIPortalApplication)context.getUIApplication(); - uiPortal.findComponentOfType(portletInstancesInPage, UIPortlet.class); - EventsWrapper eventsWrapper = (EventsWrapper)event.getRequestContext().getAttribute(PORTLET_EVENTS); - List<javax.portlet.Event> events = eventsWrapper.getEvents(); - - /* - * Iterate over all the events that the processAction - * has generated. Check among all the portlet instances deployed in the - * page (usual layout or webos) which instance can be targeted by the - * event and then process the event on the associated UIPortlet component - */ - while (events.size() > 0) - { - javax.portlet.Event nativeEvent = events.remove(0); - QName eventName = nativeEvent.getQName(); - for (Iterator<UIPortlet> iterator = portletInstancesInPage.iterator(); iterator.hasNext();) - { - UIPortlet uiPortletInPage = iterator.next(); - if (uiPortletInPage.supportsProcessingEvent(eventName) - && !eventsWrapper.isInvokedTooManyTimes(uiPortletInPage)) - { - List<javax.portlet.Event> newEvents = processEvent(uiPortletInPage, nativeEvent); - eventsWrapper.increaseCounter(uiPortletInPage); - if (context.useAjax()) - { - log - .info("Events were generated inside the scope of an AJAX call, hence will only refresh the targeted portlets"); - event.getRequestContext().addUIComponentToUpdateByAjax(uiPortletInPage); - } - else - { - log - .info("Events were generated outside the scope of an AJAX call, hence will make a full render of the page"); - context.ignoreAJAXUpdateOnPortlets(true); - } - if (newEvents != null && !newEvents.isEmpty()) - { - log.trace("The portlet: " + uiPortletInPage.getPortletContext().getId() - + " processEvent() method has generated new events itself"); - events.addAll(newEvents); - } - } - } - } - } - } - - /** - * This method is called when the javax.portlet.Event is supported by the current portlet stored in the Portlet - * Caontainer - * <p/> - * The processEvent() method can also generates IPC events and hence the portal itself will call the - * ProcessEventsActionListener once again - */ - public static <S, C extends Serializable, I> List<javax.portlet.Event> processEvent(UIPortlet<S, C> uiPortlet, - javax.portlet.Event event) - { - log.trace("Process Event: " + event.getName() + " for portlet: " + uiPortlet.getState()); - try - { - PortalRequestContext context = (PortalRequestContext)WebuiRequestContext.getCurrentInstance(); - - // - EventInvocation eventInvocation = uiPortlet.create(EventInvocation.class, context); - - // - eventInvocation.setName(event.getQName()); - eventInvocation.setPayload(event.getValue()); - - // - PortletInvocationResponse piResponse = uiPortlet.invoke(eventInvocation); - - // - ExoPortletInstanceContext instanceCtx = (ExoPortletInstanceContext)eventInvocation.getInstanceContext(); - if (instanceCtx.getModifiedContext() != null) - { - StatefulPortletContext<C> updatedCtx = (StatefulPortletContext<C>)instanceCtx.getModifiedContext(); - C portletState = updatedCtx.getState(); - uiPortlet.update(portletState); - } - - // todo: handle the error response better than this. - if (!(piResponse instanceof UpdateNavigationalStateResponse)) - { - if (piResponse instanceof ErrorResponse) - { - ErrorResponse errorResponse = (ErrorResponse)piResponse; - throw (Exception)errorResponse.getCause(); - } - else - { - throw new Exception("Unexpected response type [" + piResponse - + "]. Expected a UpdateNavigationResponse or an ErrorResponse."); - } - } - - UpdateNavigationalStateResponse navResponse = (UpdateNavigationalStateResponse)piResponse; - - // - - /* - * Update the portlet window state according to the action output - * information - * - * If the current node is displaying a usual layout page, also tells the - * page which portlet to render or not when the state is maximized - */ - WindowState state = new WindowState(getWindowStateOrDefault(navResponse)); - setNextState(uiPortlet, state); - - // update the portlet with the next mode to display - PortletMode mode = new PortletMode(getPortletModeOrDefault(navResponse)); - setNextMode(uiPortlet, mode); - - StateString navState = navResponse.getNavigationalState(); - if (navState != null) - { - uiPortlet.setNavigationalState(navResponse.getNavigationalState()); - } - setupPublicRenderParams(uiPortlet, navResponse.getPublicNavigationalStateUpdates()); - - //TODO: (mwringe) add this to the UpdateNavigationStateResponse.Event class instead of here - class PortletEvent implements javax.portlet.Event - { - QName qName; - - Serializable value; - - public PortletEvent(QName qName, Serializable value) - { - this.qName = qName; - this.value = value; - } - - public String getName() - { - return qName.getLocalPart(); - } - - public QName getQName() - { - return qName; - } - - public Serializable getValue() - { - return value; - } - } - - List<UpdateNavigationalStateResponse.Event> nsEvents = navResponse.getEvents(); - List<javax.portlet.Event> events = new ArrayList<javax.portlet.Event>(nsEvents.size()); - if (nsEvents != null && !nsEvents.isEmpty()) - { - for (UpdateNavigationalStateResponse.Event nsEvent : nsEvents) - { - javax.portlet.Event portletEvent = new PortletEvent(nsEvent.getName(), nsEvent.getPayload()); - events.add(portletEvent); - } - } - - return events; - } - catch (Exception e) - { - log.error("Problem while processesing event for the portlet: " + uiPortlet.getState(), e); - } - return null; - } - - private static String getPortletModeOrDefault(UpdateNavigationalStateResponse navResponse) - { - Mode mode = navResponse.getMode(); - if (mode == null) - { - mode = Mode.VIEW; - } - return mode.toString(); - } - - private static String getWindowStateOrDefault(UpdateNavigationalStateResponse navResponse) - { - org.gatein.pc.api.WindowState state = navResponse.getWindowState(); - if (state == null) - { - state = org.gatein.pc.api.WindowState.NORMAL; - } - return state.toString(); - } - - /** - * This listener is called when a RenderURL url has been generated by the portlet container. In that case it means - * that the render() method of a targeted portlet will be directly called and that the existing navigational state - * will be reset by removing all the Render Parameters from the cache map located in the UIPortlet - */ - static public class RenderActionListener extends EventListener<UIPortlet> - { - public void execute(Event<UIPortlet> event) throws Exception - { - UIPortlet uiPortlet = event.getSource(); - uiPortlet.setNavigationalState(null); - - // set the public params - HttpServletRequest request = event.getRequestContext().getRequest(); - setupPublicRenderParams(uiPortlet, request.getParameterMap()); - - //set render params - String navState = event.getRequestContext().getRequestParameter(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME); - if (navState != null) - { - uiPortlet.setNavigationalState(ParametersStateString.create(navState)); - } - } - } - - /** - * This method is called by the process action and render action listeners, aka during the processDecode() phase of - * our UI framework - * <p/> - * It goes throughs all the request parameters and add to the public render parameters Map the one that are supported - * by the targeted portlet - */ - static public void setupPublicRenderParams(UIPortlet uiPortlet, Map<String, String[]> requestParams) - { - if (ParameterValidation.existsAndIsNotEmpty(requestParams)) - { - UIPortal uiPortal = Util.getUIPortal(); - Map<String, String[]> publicParams = uiPortal.getPublicParameters(); - - for (String key : requestParams.keySet()) - { - String[] value = requestParams.get(key); - if (uiPortlet.supportsPublicParam(key)) - { - if (value.length > 0) - { - publicParams.put(key, value); - } - else - { - publicParams.remove(key); - } - } - } - } - - } - - static public class ChangeWindowStateActionListener extends EventListener<UIPortlet> - { - public void execute(Event<UIPortlet> event) throws Exception - { - UIPortlet uiPortlet = event.getSource(); - - UIPortalApplication uiPortalApp = uiPortlet.getAncestorOfType(UIPortalApplication.class); - UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); - PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); - pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.ignoreAJAXUpdateOnPortlets(true); - - String windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE); - if (windowState == null) - { - windowState = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID).trim(); - } - UIPageBody uiPageBody = uiPortlet.getAncestorOfType(UIPageBody.class); - UIPage uiPage = uiPortlet.getAncestorOfType(UIPage.class); - if (windowState.equals(WindowState.MAXIMIZED.toString())) - { - if (uiPageBody != null) - { - uiPortlet.setCurrentWindowState(WindowState.MAXIMIZED); - //TODO dang.tung: we have to set maximized portlet for page because in ShowMaxWindow case the PageBody isn't rendered - // reference: UIPortalLifecycle, UIPageLifecycle, renderChildren() in UIPageBody - //--------------------------------------------------------- - if (uiPage != null && uiPage.isShowMaxWindow()) - { - uiPage.setMaximizedUIPortlet(uiPortlet); - } - //--------------------------------------------------------- - uiPageBody.setMaximizedUIComponent(uiPortlet); - } - else - { - uiPortlet.setCurrentWindowState(WindowState.NORMAL); - } - return; - } - if (uiPageBody != null) - { - UIPortlet maxPortlet = (UIPortlet)uiPageBody.getMaximizedUIComponent(); - if (maxPortlet == uiPortlet) - { - uiPageBody.setMaximizedUIComponent(null); - } - } - //TODO dang.tung: for ShowMaxWindow situation - //---------------------------------------------------------------- - if (uiPage != null) - { - UIPortlet maxPortlet = (UIPortlet)uiPage.getMaximizedUIPortlet(); - if (maxPortlet == uiPortlet) - { - uiPage.setMaximizedUIPortlet(null); - } - } - //----------------------------------------------------------------- - if (windowState.equals(WindowState.MINIMIZED.toString())) - { - uiPortlet.setCurrentWindowState(WindowState.MINIMIZED); - return; - } - uiPortlet.setCurrentWindowState(WindowState.NORMAL); - - } - } - - /** This listener is called when the portlet mode of a portlet has to be changed. */ - static public class ChangePortletModeActionListener extends EventListener<UIPortlet> - { - public void execute(Event<UIPortlet> event) throws Exception - { - UIPortlet uiPortlet = event.getSource(); - String portletMode = event.getRequestContext().getRequestParameter(Constants.PORTAL_PORTLET_MODE); - if (portletMode == null) - { - portletMode = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); - } - - log.trace("Change portlet mode of " + uiPortlet.getPortletContext().getId() + " to " + portletMode); - if (portletMode.equals(PortletMode.HELP.toString())) - { - uiPortlet.setCurrentPortletMode(PortletMode.HELP); - } - else if (portletMode.equals(PortletMode.EDIT.toString())) - { - uiPortlet.setCurrentPortletMode(PortletMode.EDIT); - } - else if (portletMode.equals(PortletMode.VIEW.toString())) - { - uiPortlet.setCurrentPortletMode(PortletMode.VIEW); - } - else - { - PortletMode customMode = new PortletMode(portletMode); - uiPortlet.setCurrentPortletMode(customMode); - } - event.getRequestContext().addUIComponentToUpdateByAjax(uiPortlet); - } - } - - /** - * This listener is called when the portlet edit form (which tells information about the portlet width or height as - * well as if the info bar and its content should be shown) is invoked. - * <p/> - * It places the form in the portal black mask - */ - static public class EditPortletActionListener extends EventListener<UIPortlet> - { - public void execute(Event<UIPortlet> event) throws Exception - { - UIPortalApplication uiApp = Util.getUIPortalApplication(); - UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - uiMaskWS.setUpdated(true); - UIPortlet uiPortlet = event.getSource(); - UIPortletForm uiPortletForm = uiMaskWS.createUIComponent(UIPortletForm.class, null, null); - uiPortletForm.setValues(uiPortlet); - uiMaskWS.setWindowSize(800, -1); - event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); - } - } - -} Copied: epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java (from rev 8682, epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java) =================================================================== --- epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java (rev 0) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2012-04-10 14:31:28 UTC (rev 8683) @@ -0,0 +1,906 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.application; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.portlet.PortletMode; +import javax.portlet.WindowState; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.namespace.QName; + +import org.exoplatform.portal.Constants; +import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.webui.page.UIPage; +import org.exoplatform.portal.webui.page.UIPageBody; +import org.exoplatform.portal.webui.portal.UIPortal; +import org.exoplatform.portal.webui.util.Util; +import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; +import org.exoplatform.portal.webui.workspace.UIPortalApplication; +import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.Event.Phase; +import org.exoplatform.webui.event.EventListener; +import org.gatein.common.util.MultiValuedPropertyMap; +import org.gatein.common.util.ParameterValidation; +import org.gatein.pc.api.Mode; +import org.gatein.pc.api.ParametersStateString; +import org.gatein.pc.api.PortletContext; +import org.gatein.pc.api.StateString; +import org.gatein.pc.api.StatefulPortletContext; +import org.gatein.pc.api.invocation.ActionInvocation; +import org.gatein.pc.api.invocation.EventInvocation; +import org.gatein.pc.api.invocation.ResourceInvocation; +import org.gatein.pc.api.invocation.response.ContentResponse; +import org.gatein.pc.api.invocation.response.ErrorResponse; +import org.gatein.pc.api.invocation.response.HTTPRedirectionResponse; +import org.gatein.pc.api.invocation.response.PortletInvocationResponse; +import org.gatein.pc.api.invocation.response.SecurityErrorResponse; +import org.gatein.pc.api.invocation.response.SecurityResponse; +import org.gatein.pc.api.invocation.response.UpdateNavigationalStateResponse; + +/** May 29, 2006 */ +public class UIPortletActionListener +{ + + public static final String PORTLET_EVENTS = "PortletEvents"; + + public static final String CHANGE_WINDOW_STATE_EVENT = "PortletChangeWindowStateEvent"; + public static final String CHANGE_PORTLET_MODE_EVENT = "ChangePortletModeEvent"; + + protected static Log log = ExoLogger.getLogger("portal:UIPortletActionListener"); + + /** + * The process action listener is called when an ActionURL generated by the portlet container has been invoked by the + * client + * <p/> + * The call is delegated to the portlet container iteself using the method portletContainer.processAction(...). It + * returns an object of type ActionOutput that contains several information such as the next window state and portlet + * modes (if they have to change) as well as a list of Events to be broadcasted to the other portlets located in the + * same portal page + */ + static public class ProcessActionActionListener<S, C extends Serializable, I> extends EventListener<UIPortlet<S, C>> + { + public void execute(Event<UIPortlet<S, C>> event) throws Exception + { + UIPortlet<S, C> uiPortlet = event.getSource(); + PortalRequestContext prcontext = (PortalRequestContext)event.getRequestContext(); + + // set the public render parameters from the request before creating the invocation + HttpServletRequest request = prcontext.getRequest(); + setupPublicRenderParams(uiPortlet, request.getParameterMap()); + + // set the navigational state + String navState = prcontext.getRequestParameter(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME); + if (navState != null) + { + uiPortlet.setNavigationalState(ParametersStateString.create(navState)); + } + + // + ActionInvocation actionInvocation = uiPortlet.create(ActionInvocation.class, prcontext); + if (actionInvocation == null) + { + return; + } + // + PortletInvocationResponse portletResponse = uiPortlet.invoke(actionInvocation); + + // deal with potential portlet context modifications + ExoPortletInstanceContext instanceCtx = (ExoPortletInstanceContext)actionInvocation.getInstanceContext(); + if (instanceCtx.getModifiedContext() != null) + { + StatefulPortletContext<C> updatedCtx = (StatefulPortletContext<C>)instanceCtx.getModifiedContext(); + C portletState = uiPortlet.getModifiedState(updatedCtx); + uiPortlet.update(portletState); + } + else + { + // todo: fix me as this shouldn't probably be done only for the WSRP case + PortletContext clonedContext = instanceCtx.getClonedContext(); + if (clonedContext != null) + { + C state = uiPortlet.getClonedState(clonedContext); + uiPortlet.update(state); + } + } + + if (portletResponse instanceof UpdateNavigationalStateResponse) + { + handleUpdateNavigationalStateResponse((UpdateNavigationalStateResponse)portletResponse, uiPortlet, prcontext); + } + else if (portletResponse instanceof HTTPRedirectionResponse) + { + handleRedirectionResponse((HTTPRedirectionResponse)portletResponse, prcontext.getResponse()); + } + else if (portletResponse instanceof ErrorResponse) + { + handleErrorResponse((ErrorResponse)portletResponse); + } + else if (portletResponse instanceof SecurityResponse) + { + handleSecurityResponse((SecurityResponse)portletResponse); + } + else + { + throw new Exception("Unexpected response type [" + portletResponse + "]. Expected an UpdateNavigationResponse" + + ", a HTTPRedirectionResponse or an ErrorResponse."); + } + } + + + private void handleRedirectionResponse(HTTPRedirectionResponse redirectionResponse, HttpServletResponse response) throws IOException + { + String redirectionURL = redirectionResponse.getLocation(); + response.sendRedirect(redirectionURL); + } + + private void handleUpdateNavigationalStateResponse(UpdateNavigationalStateResponse navStateResponse, UIPortlet<S, C> uiPortlet, PortalRequestContext prcontext) throws Exception + { + /* + * Update the portlet window state according to the action output + * information + * + * If the current node is displaying a usual layout page, also tells the + * page which portlet to render or not when the state is maximized + */ + // Note: we should only update the WindowState if the UpdateNavigationalStateResponse.getWindowState is not null, + // otherwise it means the WindowState has not changed and we should use the current value. + if (navStateResponse.getWindowState() != null) + { + WindowState state = new WindowState(getWindowStateOrDefault(navStateResponse)); + setNextState(uiPortlet, state); + } + + // update the portlet with the next mode to display + // Note: we should only update the Mode if the UpdateNavigationalStateResponse.getMode is not null, + // otherwise it means the mode has not changed and we should use the current value. + if (navStateResponse.getMode() != null) + { + PortletMode mode = new PortletMode(getPortletModeOrDefault(navStateResponse)); + setNextMode(uiPortlet, mode); + } + + /* + * Cache the render parameters in the UI portlet component to handle the + * navigational state. Each time a portlet is rendered (except using + * directly a RenderURL) those parameters are added to the portlet request + * to preserve the portlet state among all the portal clicks + */ + + // + StateString navigationalState = navStateResponse.getNavigationalState(); + if (navigationalState != null) + { + uiPortlet.setNavigationalState(navigationalState); + } + + // update the public render parameters with the changes from the invocation + setupPublicRenderParams(uiPortlet, navStateResponse.getPublicNavigationalStateUpdates()); + + /* + * Handle the events returned by the action output and broadcast a new UI + * event to the ProcessEventsActionListener that will then target the + * portlet container service directly + */ + + //TODO: (mwringe) add this to the UpdateNavigationStateResponse.Event class instead of here + class PortletEvent implements javax.portlet.Event + { + QName qName; + + Serializable value; + + public PortletEvent(QName qName, Serializable value) + { + this.qName = qName; + this.value = value; + } + + public String getName() + { + return qName.getLocalPart(); + } + + public QName getQName() + { + return qName; + } + + public Serializable getValue() + { + return value; + } + } + + List<UpdateNavigationalStateResponse.Event> nsEvents = navStateResponse.getEvents(); + List<javax.portlet.Event> events = new ArrayList<javax.portlet.Event>(nsEvents.size()); + if (nsEvents != null && !nsEvents.isEmpty()) + { + for (UpdateNavigationalStateResponse.Event nsEvent : nsEvents) + { + if (uiPortlet.supportsPublishingEvent(nsEvent.getName())) + { + javax.portlet.Event portletEvent = new PortletEvent(nsEvent.getName(), nsEvent.getPayload()); + events.add(portletEvent); + } + } + } + + if (events != null) + { + prcontext.setAttribute(PORTLET_EVENTS, new EventsWrapper(events)); + uiPortlet.createEvent("ProcessEvents", Phase.PROCESS, prcontext).broadcast(); + } + + } + + private void handleErrorResponse(ErrorResponse response) throws Exception + { + throw (Exception)response.getCause(); + } + + private void handleSecurityResponse(SecurityResponse response) throws Exception + { + if (response instanceof SecurityErrorResponse) + { + SecurityErrorResponse securityErrorResponse = (SecurityErrorResponse)response; + throw new Exception("SecurityErrorResponse Returned while trying to process portlet action. ", securityErrorResponse.getThrowable()); + } + else + { + throw new Exception("Security Response of type " + response.getClass() + " encountered while trying to process portlet action."); + } + } + } + + /** + * This method is used to set the next portlet window state if this one needs to be modified because of the incoming + * request + */ + public static void setNextState(UIPortlet uiPortlet, WindowState state) + { + if (state != null) + { + UIPage uiPage = uiPortlet.getAncestorOfType(UIPage.class); + if (WindowState.MAXIMIZED.equals(state)) + { + uiPortlet.setCurrentWindowState(WindowState.MAXIMIZED); + if (uiPage != null) + { + uiPage.setMaximizedUIPortlet(uiPortlet); + } + } + else if (WindowState.MINIMIZED.equals(state)) + { + uiPortlet.setCurrentWindowState(WindowState.MINIMIZED); + if (uiPage != null) + { + uiPage.setMaximizedUIPortlet(null); + } + } + else + { + uiPortlet.setCurrentWindowState(WindowState.NORMAL); + if (uiPage != null) + { + uiPage.setMaximizedUIPortlet(null); + } + } + } + } + + /** This method is used to set the next portlet mode if this one needs to be modified because of the incoming request */ + public static void setNextMode(UIPortlet uiPortlet, PortletMode portletMode) + { + if (portletMode != null) + { + if (portletMode.equals(PortletMode.HELP)) + { + uiPortlet.setCurrentPortletMode(PortletMode.HELP); + } + else if (portletMode.equals(PortletMode.EDIT)) + { + uiPortlet.setCurrentPortletMode(PortletMode.EDIT); + } + else + { + uiPortlet.setCurrentPortletMode(PortletMode.VIEW); + } + } + } + + /** + * The serveResource() method defined in the JSR 286 specs has several goals: - provide binary output like images to + * be displayed in the portlet (in the previous spec - JSR 168 - a servlet was needed) - provide text output that + * does not impact the entire portal rendering, it is for instance usefull when dealing with Javascript to return + * some JSON structures + * <p/> + * The method delegates the call to the portlet container serverResource method after filling the ResourceInput + * object with the current request state. + * <p/> + * This returns a ResourceOutput object that can content binary or text contentType + * <p/> + * Finally the content is set in the portal response writer or outputstream depending on the type; the + * processRender() method of the portal is not called as we set the response as complete + */ + static public class ServeResourceActionListener<S, C extends Serializable, I> extends EventListener<UIPortlet<S, C>> + { + public void execute(Event<UIPortlet<S, C>> event) throws Exception + { + UIPortlet<S, C> uiPortlet = event.getSource(); + log.trace("Serve Resource for portlet: " + uiPortlet.getPortletContext()); + String resourceId = null; + + try + { + PortalRequestContext context = (PortalRequestContext)event.getRequestContext(); + HttpServletResponse response = context.getResponse(); + + //Set the NavigationalState + String navState = context.getRequestParameter(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME); + if (navState != null) + { + uiPortlet.setNavigationalState(ParametersStateString.create(navState)); + } + + // + ResourceInvocation resourceInvocation = uiPortlet.create(ResourceInvocation.class, context); + + // set the resourceId to be used in case of a problem + resourceId = resourceInvocation.getResourceId(); + + // + PortletInvocationResponse portletResponse = uiPortlet.invoke(resourceInvocation); + + // todo: handle the error response better than this. + if (!(portletResponse instanceof ContentResponse)) + { + if (portletResponse instanceof ErrorResponse) + { + ErrorResponse errorResponse = (ErrorResponse)portletResponse; + if (errorResponse.getCause() != null) + { + throw (Exception)errorResponse.getCause(); + } + else if (errorResponse.getMessage() != null) + { + throw new Exception("Received an error response with message : " + errorResponse.getMessage()); + } + else + { + throw new Exception("Received an error response."); + } + + } + else + { + throw new Exception("Unexpected response type [" + portletResponse + + "]. Expected a ContentResponse or an ErrorResponse."); + } + } + + ContentResponse piResponse = (ContentResponse)portletResponse; + + // + //Manage headers + if (piResponse.getProperties() != null && piResponse.getProperties().getTransportHeaders() != null) + { + MultiValuedPropertyMap<String> transportHeaders = piResponse.getProperties().getTransportHeaders(); + Map<String, String> headers = new HashMap<String, String>(); + + for (String key : transportHeaders.keySet()) + { + for (String value : transportHeaders.getValues(key)) + { + headers.put(key, value); + } + } + context.setHeaders(headers); + } + + String contentType = piResponse.getContentType(); + + if (contentType == null) + { + return; + } + + log.trace("Try to get a resource of type: " + contentType + " for the portlet: " + + uiPortlet.getPortletContext()); + response.setContentType(contentType); + if (piResponse.getChars() != null) + { + OutputStream stream = response.getOutputStream(); + stream.write(piResponse.getChars().getBytes(response.getCharacterEncoding())); + } + else + { + if (piResponse.getBytes() != null) + { + OutputStream stream = response.getOutputStream(); + stream.write(piResponse.getBytes()); + } + else + { + if (piResponse.getChars() != null) + { + log.error("Received a content type of " + contentType + " but it contains no bytes of data. Chars were unexpectantly returned instead : " + piResponse.getChars()); + } + else + { + log.error("Received a content type of " + contentType + " but it contains no bytes of data."); + } + } + + + } + context.getResponse().flushBuffer(); + + } + catch (Exception e) + { + log.error("Problem while serving resource " + (resourceId != null ? resourceId : "") + " for the portlet: " + uiPortlet.getPortletContext().getId(), e); + } + finally + { + /** + * The resource method does not need to go through the render phase + */ + event.getRequestContext().setResponseComplete(true); + } + } + } + + /** + * Process Events sent by the portlet API during the processAction() and serverResource() methods defined in Portlet + * API 2.0 (JSR 286) + */ + static public class ProcessEventsActionListener extends EventListener<UIPortlet> + { + public void execute(Event<UIPortlet> event) throws Exception + { + UIPortlet uiPortlet = event.getSource(); + PortalRequestContext context = (PortalRequestContext)event.getRequestContext(); + List<UIPortlet> portletInstancesInPage = new ArrayList<UIPortlet>(); + // UIPortalApplication uiPortal = uiPortlet.getAncestorOfType(UIPortalApplication.class); + UIPortalApplication uiPortal = (UIPortalApplication)context.getUIApplication(); + uiPortal.findComponentOfType(portletInstancesInPage, UIPortlet.class); + EventsWrapper eventsWrapper = (EventsWrapper)event.getRequestContext().getAttribute(PORTLET_EVENTS); + List<javax.portlet.Event> events = eventsWrapper.getEvents(); + + /* + * Iterate over all the events that the processAction + * has generated. Check among all the portlet instances deployed in the + * page (usual layout or webos) which instance can be targeted by the + * event and then process the event on the associated UIPortlet component + */ + while (events.size() > 0) + { + javax.portlet.Event nativeEvent = events.remove(0); + QName eventName = nativeEvent.getQName(); + for (Iterator<UIPortlet> iterator = portletInstancesInPage.iterator(); iterator.hasNext();) + { + UIPortlet uiPortletInPage = iterator.next(); + if (uiPortletInPage.supportsProcessingEvent(eventName) + && !eventsWrapper.isInvokedTooManyTimes(uiPortletInPage)) + { + List<javax.portlet.Event> newEvents = processEvent(uiPortletInPage, nativeEvent); + eventsWrapper.increaseCounter(uiPortletInPage); + if (context.useAjax()) + { + log + .info("Events were generated inside the scope of an AJAX call, hence will only refresh the targeted portlets"); + event.getRequestContext().addUIComponentToUpdateByAjax(uiPortletInPage); + } + else + { + log + .info("Events were generated outside the scope of an AJAX call, hence will make a full render of the page"); + context.ignoreAJAXUpdateOnPortlets(true); + } + if (newEvents != null && !newEvents.isEmpty()) + { + log.trace("The portlet: " + uiPortletInPage.getPortletContext().getId() + + " processEvent() method has generated new events itself"); + events.addAll(newEvents); + } + } + } + } + } + } + + /** + * This method is called when the javax.portlet.Event is supported by the current portlet stored in the Portlet + * Caontainer + * <p/> + * The processEvent() method can also generates IPC events and hence the portal itself will call the + * ProcessEventsActionListener once again + */ + public static <S, C extends Serializable, I> List<javax.portlet.Event> processEvent(UIPortlet<S, C> uiPortlet, + javax.portlet.Event event) + { + log.trace("Process Event: " + event.getName() + " for portlet: " + uiPortlet.getState()); + try + { + PortalRequestContext context = (PortalRequestContext)WebuiRequestContext.getCurrentInstance(); + + // + EventInvocation eventInvocation = uiPortlet.create(EventInvocation.class, context); + + // + eventInvocation.setName(event.getQName()); + eventInvocation.setPayload(event.getValue()); + + // + PortletInvocationResponse piResponse = uiPortlet.invoke(eventInvocation); + + // + ExoPortletInstanceContext instanceCtx = (ExoPortletInstanceContext)eventInvocation.getInstanceContext(); + if (instanceCtx.getModifiedContext() != null) + { + StatefulPortletContext<C> updatedCtx = (StatefulPortletContext<C>)instanceCtx.getModifiedContext(); + C portletState = updatedCtx.getState(); + uiPortlet.update(portletState); + } + + // todo: handle the error response better than this. + if (!(piResponse instanceof UpdateNavigationalStateResponse)) + { + if (piResponse instanceof ErrorResponse) + { + ErrorResponse errorResponse = (ErrorResponse)piResponse; + throw (Exception)errorResponse.getCause(); + } + else + { + throw new Exception("Unexpected response type [" + piResponse + + "]. Expected a UpdateNavigationResponse or an ErrorResponse."); + } + } + + UpdateNavigationalStateResponse navResponse = (UpdateNavigationalStateResponse)piResponse; + + // + + /* + * Update the portlet window state according to the action output + * information + * + * If the current node is displaying a usual layout page, also tells the + * page which portlet to render or not when the state is maximized + */ + WindowState state = new WindowState(getWindowStateOrDefault(navResponse)); + setNextState(uiPortlet, state); + + // update the portlet with the next mode to display + PortletMode mode = new PortletMode(getPortletModeOrDefault(navResponse)); + setNextMode(uiPortlet, mode); + + StateString navState = navResponse.getNavigationalState(); + if (navState != null) + { + uiPortlet.setNavigationalState(navResponse.getNavigationalState()); + } + setupPublicRenderParams(uiPortlet, navResponse.getPublicNavigationalStateUpdates()); + + //TODO: (mwringe) add this to the UpdateNavigationStateResponse.Event class instead of here + class PortletEvent implements javax.portlet.Event + { + QName qName; + + Serializable value; + + public PortletEvent(QName qName, Serializable value) + { + this.qName = qName; + this.value = value; + } + + public String getName() + { + return qName.getLocalPart(); + } + + public QName getQName() + { + return qName; + } + + public Serializable getValue() + { + return value; + } + } + + List<UpdateNavigationalStateResponse.Event> nsEvents = navResponse.getEvents(); + List<javax.portlet.Event> events = new ArrayList<javax.portlet.Event>(nsEvents.size()); + if (nsEvents != null && !nsEvents.isEmpty()) + { + for (UpdateNavigationalStateResponse.Event nsEvent : nsEvents) + { + javax.portlet.Event portletEvent = new PortletEvent(nsEvent.getName(), nsEvent.getPayload()); + events.add(portletEvent); + } + } + + return events; + } + catch (Exception e) + { + log.error("Problem while processesing event for the portlet: " + uiPortlet.getState(), e); + } + return null; + } + + private static String getPortletModeOrDefault(UpdateNavigationalStateResponse navResponse) + { + Mode mode = navResponse.getMode(); + if (mode == null) + { + mode = Mode.VIEW; + } + return mode.toString(); + } + + private static String getWindowStateOrDefault(UpdateNavigationalStateResponse navResponse) + { + org.gatein.pc.api.WindowState state = navResponse.getWindowState(); + if (state == null) + { + state = org.gatein.pc.api.WindowState.NORMAL; + } + return state.toString(); + } + + /** + * This listener is called when a RenderURL url has been generated by the portlet container. In that case it means + * that the render() method of a targeted portlet will be directly called and that the existing navigational state + * will be reset by removing all the Render Parameters from the cache map located in the UIPortlet + */ + static public class RenderActionListener extends EventListener<UIPortlet> + { + public void execute(Event<UIPortlet> event) throws Exception + { + UIPortlet uiPortlet = event.getSource(); + uiPortlet.setNavigationalState(null); + + // set the public params + HttpServletRequest request = event.getRequestContext().getRequest(); + setupPublicRenderParams(uiPortlet, request.getParameterMap()); + + //set render params + String navState = event.getRequestContext().getRequestParameter(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME); + if (navState != null) + { + uiPortlet.setNavigationalState(ParametersStateString.create(navState)); + } + } + } + + /** + * This method is called by the process action and render action listeners, aka during the processDecode() phase of + * our UI framework + * <p/> + * It goes throughs all the request parameters and add to the public render parameters Map the one that are supported + * by the targeted portlet + */ + static public void setupPublicRenderParams(UIPortlet uiPortlet, Map<String, String[]> requestParams) + { + if (ParameterValidation.existsAndIsNotEmpty(requestParams)) + { + UIPortal uiPortal = Util.getUIPortal(); + Map<String, String[]> publicParams = uiPortal.getPublicParameters(); + + for (String key : requestParams.keySet()) + { + String[] value = requestParams.get(key); + if (uiPortlet.supportsPublicParam(key)) + { + if (value.length > 0) + { + publicParams.put(key, value); + } + else + { + publicParams.remove(key); + } + } + } + } + + } + + static public class ChangeWindowStateActionListener extends EventListener<UIPortlet> + { + public void execute(Event<UIPortlet> event) throws Exception + { + UIPortlet uiPortlet = event.getSource(); + + UIPortalApplication uiPortalApp = uiPortlet.getAncestorOfType(UIPortalApplication.class); + UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); + PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); + pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); + pcontext.ignoreAJAXUpdateOnPortlets(true); + + String windowState = null; + + Object changeWindowStateAttribute = event.getRequestContext().getAttribute(CHANGE_WINDOW_STATE_EVENT); + if (changeWindowStateAttribute != null && changeWindowStateAttribute instanceof String) + { + windowState = (String)changeWindowStateAttribute; + } + + if (windowState == null) + { + windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE); + } + if (windowState == null) + { + windowState = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID).trim(); + } + + if (windowState == null) + { + windowState = uiPortlet.getCurrentWindowState().toString(); + } + + + UIPageBody uiPageBody = uiPortlet.getAncestorOfType(UIPageBody.class); + UIPage uiPage = uiPortlet.getAncestorOfType(UIPage.class); + if (windowState.equals(WindowState.MAXIMIZED.toString())) + { + if (uiPageBody != null) + { + uiPortlet.setCurrentWindowState(WindowState.MAXIMIZED); + //TODO dang.tung: we have to set maximized portlet for page because in ShowMaxWindow case the PageBody isn't rendered + // reference: UIPortalLifecycle, UIPageLifecycle, renderChildren() in UIPageBody + //--------------------------------------------------------- + if (uiPage != null && uiPage.isShowMaxWindow()) + { + uiPage.setMaximizedUIPortlet(uiPortlet); + } + //--------------------------------------------------------- + uiPageBody.setMaximizedUIComponent(uiPortlet); + } + else + { + uiPortlet.setCurrentWindowState(WindowState.NORMAL); + } + return; + } + if (uiPageBody != null) + { + UIPortlet maxPortlet = (UIPortlet)uiPageBody.getMaximizedUIComponent(); + if (maxPortlet == uiPortlet) + { + uiPageBody.setMaximizedUIComponent(null); + } + } + //TODO dang.tung: for ShowMaxWindow situation + //---------------------------------------------------------------- + if (uiPage != null) + { + UIPortlet maxPortlet = (UIPortlet)uiPage.getMaximizedUIPortlet(); + if (maxPortlet == uiPortlet) + { + uiPage.setMaximizedUIPortlet(null); + } + } + //----------------------------------------------------------------- + if (windowState.equals(WindowState.MINIMIZED.toString())) + { + uiPortlet.setCurrentWindowState(WindowState.MINIMIZED); + return; + } + uiPortlet.setCurrentWindowState(WindowState.NORMAL); + + } + } + + /** This listener is called when the portlet mode of a portlet has to be changed. */ + static public class ChangePortletModeActionListener extends EventListener<UIPortlet> + { + public void execute(Event<UIPortlet> event) throws Exception + { + UIPortlet uiPortlet = event.getSource(); + + String portletMode = null; + + Object changePortletModeAttribute = event.getRequestContext().getAttribute(CHANGE_PORTLET_MODE_EVENT); + if (changePortletModeAttribute != null && changePortletModeAttribute instanceof String) + { + portletMode = (String)changePortletModeAttribute; + } + + if (portletMode == null) + { + portletMode = event.getRequestContext().getRequestParameter(Constants.PORTAL_PORTLET_MODE); + } + if (portletMode == null) + { + portletMode = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); + } + if (portletMode == null) + { + portletMode = uiPortlet.getCurrentPortletMode().toString(); + } + + log.trace("Change portlet mode of " + uiPortlet.getPortletContext().getId() + " to " + portletMode); + if (portletMode.equals(PortletMode.HELP.toString())) + { + uiPortlet.setCurrentPortletMode(PortletMode.HELP); + } + else if (portletMode.equals(PortletMode.EDIT.toString())) + { + uiPortlet.setCurrentPortletMode(PortletMode.EDIT); + } + else if (portletMode.equals(PortletMode.VIEW.toString())) + { + uiPortlet.setCurrentPortletMode(PortletMode.VIEW); + } + else + { + PortletMode customMode = new PortletMode(portletMode); + uiPortlet.setCurrentPortletMode(customMode); + } + event.getRequestContext().addUIComponentToUpdateByAjax(uiPortlet); + } + } + + /** + * This listener is called when the portlet edit form (which tells information about the portlet width or height as + * well as if the info bar and its content should be shown) is invoked. + * <p/> + * It places the form in the portal black mask + */ + static public class EditPortletActionListener extends EventListener<UIPortlet> + { + public void execute(Event<UIPortlet> event) throws Exception + { + UIPortalApplication uiApp = Util.getUIPortalApplication(); + UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); + uiMaskWS.setUpdated(true); + UIPortlet uiPortlet = event.getSource(); + UIPortletForm uiPortletForm = uiMaskWS.createUIComponent(UIPortletForm.class, null, null); + uiPortletForm.setValues(uiPortlet); + uiMaskWS.setWindowSize(800, -1); + event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); + } + } + +} Deleted: epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2012-04-10 14:31:28 UTC (rev 8683) @@ -1,349 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.webui.application; - -import org.exoplatform.Constants; -import org.exoplatform.commons.utils.Text; -import org.exoplatform.container.ExoContainer; -import org.exoplatform.portal.application.PortalRequestContext; -import org.exoplatform.portal.portlet.PortletExceptionHandleService; -import org.exoplatform.portal.webui.portal.UIPortal; -import org.exoplatform.portal.webui.util.Util; -import org.exoplatform.portal.webui.workspace.UIPortalApplication; -import org.exoplatform.resolver.ApplicationResourceResolver; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.exoplatform.services.portletcontainer.PortletContainerException; -import org.exoplatform.web.application.ApplicationMessage; -import org.exoplatform.webui.application.WebuiApplication; -import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.webui.core.UIComponent; -import org.exoplatform.webui.core.lifecycle.Lifecycle; -import org.exoplatform.webui.core.lifecycle.WebuiBindingContext; -import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.exception.MessageException; -import org.gatein.common.util.MultiValuedPropertyMap; -import org.gatein.pc.api.invocation.RenderInvocation; -import org.gatein.pc.api.invocation.response.ErrorResponse; -import org.gatein.pc.api.invocation.response.FragmentResponse; -import org.gatein.pc.api.invocation.response.PortletInvocationResponse; -import org.w3c.dom.Element; - -import java.io.Serializable; -import java.nio.charset.Charset; -import java.util.List; -import java.util.Map; - -import javax.portlet.MimeResponse; -import javax.portlet.PortletMode; -import javax.portlet.WindowState; -import javax.servlet.http.Cookie; - -/** - * Created by The eXo Platform SAS May 8, 2006 - */ -public class UIPortletLifecycle<S, C extends Serializable, I> extends Lifecycle<UIPortlet<S, C>> -{ - - protected static Log log = ExoLogger.getLogger("portal:UIPortletLifecycle"); - - /** - * This processAction method associated with the portlet UI component does the - * following work: - * - * 1) If the current request is one that target the portal than an event - * targeting a Portal level ActionListener is sent. This case happen when the - * incoming request contains the parameter - * PortalRequestContext.UI_COMPONENT_ACTION (portal:action). When the event is - * broadcasted the methods is over 2) In other cases, the request targets the - * portlet either to a) change the portlet mode b) change the window state c) - * make a processAction() or render() call to the portlet container (Portlet - * API methods here) In those 3 cases, dedicated events are created and - * broadcasted and the portlet is added in the list of components to update - * within the AJAX call - */ - public void processAction(UIPortlet<S, C> uicomponent, WebuiRequestContext context) throws Exception - { - try - { - String action = context.getRequestParameter(PortalRequestContext.UI_COMPONENT_ACTION); - if (action != null) - { - Event<UIComponent> event = uicomponent.createEvent(action, Event.Phase.PROCESS, context); - if (event != null) - event.broadcast(); - return; - } - - String portletMode = context.getRequestParameter(org.exoplatform.portal.Constants.PORTAL_PORTLET_MODE); - if (portletMode != null) - { - Event<UIComponent> event = uicomponent.createEvent("ChangePortletMode", Event.Phase.PROCESS, context); - if (event != null) - event.broadcast(); - } - - String windowState = context.getRequestParameter(org.exoplatform.portal.Constants.PORTAL_WINDOW_STATE); - if (windowState != null) - { - Event<UIComponent> event = uicomponent.createEvent("ChangeWindowState", Event.Phase.PROCESS, context); - if (event != null) - event.broadcast(); - } - - /* - * Check the type of the incoming request, can be either an ActionURL or a - * RenderURL one - * - * In case of a RenderURL, the parameter state map must be invalidated and - * this is done in the associated ActionListener - * - * If no action type is specified we assume the default, which is to render - */ - String portletActionType = context.getRequestParameter(Constants.TYPE_PARAMETER); - if (portletActionType != null) - { - if (portletActionType.equals(Constants.PORTAL_PROCESS_ACTION)) - { - Event<UIComponent> event = uicomponent.createEvent("ProcessAction", Event.Phase.PROCESS, context); - if (event != null) - event.broadcast(); - } - else if (portletActionType.equals(Constants.PORTAL_SERVE_RESOURCE)) - { - Event<UIComponent> event = uicomponent.createEvent("ServeResource", Event.Phase.PROCESS, context); - if (event != null) - event.broadcast(); - } - } - else - { - Event<UIComponent> event = uicomponent.createEvent("Render", Event.Phase.PROCESS, context); - if (event != null) - event.broadcast(); - } - - context.addUIComponentToUpdateByAjax(uicomponent); - } - catch (Exception e) - { - String message = e.getLocalizedMessage(); - log.error("Error processing the action: " + message, e); - Object[] args = {message}; - context.addUIComponentToUpdateByAjax(uicomponent); - throw new MessageException(new ApplicationMessage("UIPortletLifecycle.msg.process-error", args, ApplicationMessage.ERROR)); - } - - } - - /** - * This methods of the Lifecycle writes into the output writer the content of - * the portlet - * - * 1) Create a RenderInput object and fill it with all the Request information - * 2) Call the portletContainer.render() method of the Portlet Container to - * get the HTML generated fragment 3) Then if the current request is an AJAX - * one, just write in the buffer the content returned by the portlet container - * 4) If not AJAX, then merge the content with the UIPortlet.gtmpl - */ - public void processRender(UIPortlet<S, C> uicomponent, WebuiRequestContext context) throws Exception - { - PortalRequestContext prcontext = (PortalRequestContext)context; - ExoContainer container = prcontext.getApplication().getApplicationServiceContainer(); - - // - Text markup = null; - - try - { - Map<String, String[]> paramMap = prcontext.getRequest().getParameterMap(); - if (paramMap.containsKey("removePP")) - { - UIPortal uiPortal = Util.getUIPortal(); - for (String publicParamName : paramMap.get("removePP")) - { - uiPortal.getPublicParameters().remove(publicParamName); - } - } - - RenderInvocation renderInvocation = uicomponent.create(RenderInvocation.class, prcontext); - - String appStatus = uicomponent.getProperties().get("appStatus"); - if ("Window".equals(uicomponent.getPortletStyle()) && !("SHOW".equals(appStatus) || "HIDE".equals(appStatus))) - { - markup = Text.create("<span></span>"); - } - else - { - int portalMode = Util.getUIPortalApplication().getModeState(); - - //Check mode of portal, portlet and permission for viewable - if ((portalMode == UIPortalApplication.NORMAL_MODE || portalMode == UIPortalApplication.APP_VIEW_EDIT_MODE - || portalMode == UIPortalApplication.CONTAINER_VIEW_EDIT_MODE || uicomponent.getCurrentPortletMode() - .equals(PortletMode.EDIT)) - && uicomponent.hasPermission()) - { - PortletInvocationResponse response = uicomponent.invoke(renderInvocation); - if (response instanceof FragmentResponse) - { - FragmentResponse fragmentResponse = (FragmentResponse) response; - switch (fragmentResponse.getType()) - { - case FragmentResponse.TYPE_CHARS : - markup = Text.create(fragmentResponse.getContent()); - break; - case FragmentResponse.TYPE_BYTES : - markup = Text.create(fragmentResponse.getBytes(), Charset.forName("UTF-8")); - break; - case FragmentResponse.TYPE_EMPTY : - markup = Text.create(""); - break; - } - uicomponent.setConfiguredTitle(fragmentResponse.getTitle()); - - // setup portlet properties - if (fragmentResponse.getProperties() != null) - { - //setup transport headers - if (fragmentResponse.getProperties().getTransportHeaders() != null) - { - MultiValuedPropertyMap<String> transportHeaders = fragmentResponse.getProperties() - .getTransportHeaders(); - for (String key : transportHeaders.keySet()) - { - for (String value : transportHeaders.getValues(key)) - { - prcontext.getResponse().setHeader(key, value); - } - } - } - - //setup up portlet cookies - if (fragmentResponse.getProperties().getCookies() != null) - { - List<Cookie> cookies = fragmentResponse.getProperties().getCookies(); - for (Cookie cookie : cookies) - { - prcontext.getResponse().addCookie(cookie); - } - } - - //setup markup headers - if (fragmentResponse.getProperties().getMarkupHeaders() != null) - { - MultiValuedPropertyMap<Element> markupHeaders = fragmentResponse.getProperties() - .getMarkupHeaders(); - - List<Element> markupElements = markupHeaders.getValues(MimeResponse.MARKUP_HEAD_ELEMENT); - if (markupElements != null) - { - for (Element element : markupElements) - { - if ("title".equals(element.getNodeName().toLowerCase()) - && element.getFirstChild() != null) - { - String title = element.getFirstChild().getNodeValue(); - prcontext.getRequest().setAttribute(PortalRequestContext.REQUEST_TITLE, title); - } - else - { - prcontext.addExtraMarkupHeader(element); - } - } - } - } - } - - } - else - { - - PortletContainerException pcException; - - if (response instanceof ErrorResponse) - { - ErrorResponse errorResponse = (ErrorResponse)response; - pcException = - new PortletContainerException(errorResponse.getMessage(), errorResponse.getCause()); - } - else - { - pcException = - new PortletContainerException("Unknown invocation response type [" + response.getClass() - + "]. Expected a FragmentResponse or an ErrorResponse"); - } - - // - PortletExceptionHandleService portletExceptionService = uicomponent.getApplicationComponent(PortletExceptionHandleService.class); - if (portletExceptionService != null) - { - portletExceptionService.handle(pcException); - } - - // Log the error - log.error("Portlet render threw an exception", pcException); - - markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError")); - } - } - } - } - catch (Exception e) - { - PortletContainerException pcException = new PortletContainerException(e); - PortletExceptionHandleService portletExceptionService = uicomponent.getApplicationComponent(PortletExceptionHandleService.class); - if (portletExceptionService != null) - { - portletExceptionService.handle(pcException); - } - - // Log the error - log.error("Portlet render threw an exception", pcException); - - // - markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError")); - } - - // - if (context.useAjax() && !prcontext.getFullRender()) - { - if (markup != null) - { - markup.writeTo(prcontext.getWriter()); - } - } - else - { - WebuiApplication app = (WebuiApplication)prcontext.getApplication(); - ApplicationResourceResolver resolver = app.getResourceResolver(); - WebuiBindingContext bcontext = new WebuiBindingContext(resolver, context.getWriter(), uicomponent, prcontext); - bcontext.put(UIComponent.UICOMPONENT, uicomponent); - bcontext.put("portletContent", markup); - try - { - renderTemplate(uicomponent.getTemplate(), bcontext); - } - catch (Throwable ex) - { - ex.printStackTrace(); - } - } - } -} Copied: epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java (from rev 8682, epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java) =================================================================== --- epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java (rev 0) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2012-04-10 14:31:28 UTC (rev 8683) @@ -0,0 +1,375 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.application; + +import org.exoplatform.Constants; +import org.exoplatform.commons.utils.Text; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.portlet.PortletExceptionHandleService; +import org.exoplatform.portal.webui.portal.UIPortal; +import org.exoplatform.portal.webui.util.Util; +import org.exoplatform.portal.webui.workspace.UIPortalApplication; +import org.exoplatform.resolver.ApplicationResourceResolver; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.exoplatform.services.portletcontainer.PortletContainerException; +import org.exoplatform.web.application.ApplicationMessage; +import org.exoplatform.webui.application.WebuiApplication; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.core.lifecycle.Lifecycle; +import org.exoplatform.webui.core.lifecycle.WebuiBindingContext; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.exception.MessageException; +import org.gatein.common.util.MultiValuedPropertyMap; +import org.gatein.pc.api.invocation.RenderInvocation; +import org.gatein.pc.api.invocation.response.ErrorResponse; +import org.gatein.pc.api.invocation.response.FragmentResponse; +import org.gatein.pc.api.invocation.response.PortletInvocationResponse; +import org.w3c.dom.Element; + +import java.io.Serializable; +import java.nio.charset.Charset; +import java.util.List; +import java.util.Map; + +import javax.portlet.MimeResponse; +import javax.portlet.PortletMode; +import javax.portlet.WindowState; +import javax.servlet.http.Cookie; + +/** + * Created by The eXo Platform SAS May 8, 2006 + */ +public class UIPortletLifecycle<S, C extends Serializable, I> extends Lifecycle<UIPortlet<S, C>> +{ + + protected static Log log = ExoLogger.getLogger("portal:UIPortletLifecycle"); + + /** + * This processAction method associated with the portlet UI component does the + * following work: + * + * 1) If the current request is one that target the portal than an event + * targeting a Portal level ActionListener is sent. This case happen when the + * incoming request contains the parameter + * PortalRequestContext.UI_COMPONENT_ACTION (portal:action). When the event is + * broadcasted the methods is over 2) In other cases, the request targets the + * portlet either to a) change the portlet mode b) change the window state c) + * make a processAction() or render() call to the portlet container (Portlet + * API methods here) In those 3 cases, dedicated events are created and + * broadcasted and the portlet is added in the list of components to update + * within the AJAX call + */ + public void processAction(UIPortlet<S, C> uicomponent, WebuiRequestContext context) throws Exception + { + try + { + //The PortletMode and WindowState can change during a portlet invocation, so we need + //to be able to compare the results before and after invoking the portlet to know if + //we need to broadcast a change event or not. + PortletMode currentPortletMode = uicomponent.getCurrentPortletMode(); + WindowState currentWindowState = uicomponent.getCurrentWindowState(); + + String action = context.getRequestParameter(PortalRequestContext.UI_COMPONENT_ACTION); + if (action != null) + { + Event<UIComponent> event = uicomponent.createEvent(action, Event.Phase.PROCESS, context); + if (event != null) + event.broadcast(); + return; + } + + String portletMode = context.getRequestParameter(org.exoplatform.portal.Constants.PORTAL_PORTLET_MODE); + if (portletMode != null) + { + Event<UIComponent> event = uicomponent.createEvent("ChangePortletMode", Event.Phase.PROCESS, context); + if (event != null) + event.broadcast(); + } + + String windowState = context.getRequestParameter(org.exoplatform.portal.Constants.PORTAL_WINDOW_STATE); + if (windowState != null) + { + Event<UIComponent> event = uicomponent.createEvent("ChangeWindowState", Event.Phase.PROCESS, context); + if (event != null) + event.broadcast(); + } + + /* + * Check the type of the incoming request, can be either an ActionURL or a + * RenderURL one + * + * In case of a RenderURL, the parameter state map must be invalidated and + * this is done in the associated ActionListener + * + * If no action type is specified we assume the default, which is to render + */ + String portletActionType = context.getRequestParameter(Constants.TYPE_PARAMETER); + if (portletActionType != null) + { + if (portletActionType.equals(Constants.PORTAL_PROCESS_ACTION)) + { + Event<UIComponent> event = uicomponent.createEvent("ProcessAction", Event.Phase.PROCESS, context); + if (event != null) + event.broadcast(); + } + else if (portletActionType.equals(Constants.PORTAL_SERVE_RESOURCE)) + { + Event<UIComponent> event = uicomponent.createEvent("ServeResource", Event.Phase.PROCESS, context); + if (event != null) + event.broadcast(); + } + } + else + { + Event<UIComponent> event = uicomponent.createEvent("Render", Event.Phase.PROCESS, context); + if (event != null) + event.broadcast(); + } + + //These two checks needs to go after the ProcessAction, ServeResource or Render broadcast events. + //The mode or state can change during the invocation and we need to be able to broadcast the change + //event if this occurs. + if (currentPortletMode != null && !currentPortletMode.equals(uicomponent.getCurrentPortletMode())) + { + context.setAttribute(UIPortletActionListener.CHANGE_PORTLET_MODE_EVENT, uicomponent.getCurrentPortletMode().toString()); + Event<UIComponent> event = uicomponent.createEvent("ChangePortletMode", Event.Phase.PROCESS, context); + if (event != null) + event.broadcast(); + context.setAttribute(UIPortletActionListener.CHANGE_PORTLET_MODE_EVENT, null); + } + if (currentWindowState != null && !currentWindowState.equals(uicomponent.getCurrentWindowState())) + { + context.setAttribute(UIPortletActionListener.CHANGE_WINDOW_STATE_EVENT, uicomponent.getCurrentWindowState().toString()); + Event<UIComponent> event = uicomponent.createEvent("ChangeWindowState", Event.Phase.PROCESS, context); + if (event != null) + event.broadcast(); + context.setAttribute(UIPortletActionListener.CHANGE_WINDOW_STATE_EVENT, null); + } + + context.addUIComponentToUpdateByAjax(uicomponent); + } + catch (Exception e) + { + String message = e.getLocalizedMessage(); + log.error("Error processing the action: " + message, e); + Object[] args = {message}; + context.addUIComponentToUpdateByAjax(uicomponent); + throw new MessageException(new ApplicationMessage("UIPortletLifecycle.msg.process-error", args, ApplicationMessage.ERROR)); + } + + } + + /** + * This methods of the Lifecycle writes into the output writer the content of + * the portlet + * + * 1) Create a RenderInput object and fill it with all the Request information + * 2) Call the portletContainer.render() method of the Portlet Container to + * get the HTML generated fragment 3) Then if the current request is an AJAX + * one, just write in the buffer the content returned by the portlet container + * 4) If not AJAX, then merge the content with the UIPortlet.gtmpl + */ + public void processRender(UIPortlet<S, C> uicomponent, WebuiRequestContext context) throws Exception + { + PortalRequestContext prcontext = (PortalRequestContext)context; + ExoContainer container = prcontext.getApplication().getApplicationServiceContainer(); + + // + Text markup = null; + + try + { + Map<String, String[]> paramMap = prcontext.getRequest().getParameterMap(); + if (paramMap.containsKey("removePP")) + { + UIPortal uiPortal = Util.getUIPortal(); + for (String publicParamName : paramMap.get("removePP")) + { + uiPortal.getPublicParameters().remove(publicParamName); + } + } + + RenderInvocation renderInvocation = uicomponent.create(RenderInvocation.class, prcontext); + + String appStatus = uicomponent.getProperties().get("appStatus"); + if ("Window".equals(uicomponent.getPortletStyle()) && !("SHOW".equals(appStatus) || "HIDE".equals(appStatus))) + { + markup = Text.create("<span></span>"); + } + else + { + int portalMode = Util.getUIPortalApplication().getModeState(); + + //Check mode of portal, portlet and permission for viewable + if ((portalMode == UIPortalApplication.NORMAL_MODE || portalMode == UIPortalApplication.APP_VIEW_EDIT_MODE + || portalMode == UIPortalApplication.CONTAINER_VIEW_EDIT_MODE || uicomponent.getCurrentPortletMode() + .equals(PortletMode.EDIT)) + && uicomponent.hasPermission()) + { + PortletInvocationResponse response = uicomponent.invoke(renderInvocation); + if (response instanceof FragmentResponse) + { + FragmentResponse fragmentResponse = (FragmentResponse) response; + switch (fragmentResponse.getType()) + { + case FragmentResponse.TYPE_CHARS : + markup = Text.create(fragmentResponse.getContent()); + break; + case FragmentResponse.TYPE_BYTES : + markup = Text.create(fragmentResponse.getBytes(), Charset.forName("UTF-8")); + break; + case FragmentResponse.TYPE_EMPTY : + markup = Text.create(""); + break; + } + uicomponent.setConfiguredTitle(fragmentResponse.getTitle()); + + // setup portlet properties + if (fragmentResponse.getProperties() != null) + { + //setup transport headers + if (fragmentResponse.getProperties().getTransportHeaders() != null) + { + MultiValuedPropertyMap<String> transportHeaders = fragmentResponse.getProperties() + .getTransportHeaders(); + for (String key : transportHeaders.keySet()) + { + for (String value : transportHeaders.getValues(key)) + { + prcontext.getResponse().setHeader(key, value); + } + } + } + + //setup up portlet cookies + if (fragmentResponse.getProperties().getCookies() != null) + { + List<Cookie> cookies = fragmentResponse.getProperties().getCookies(); + for (Cookie cookie : cookies) + { + prcontext.getResponse().addCookie(cookie); + } + } + + //setup markup headers + if (fragmentResponse.getProperties().getMarkupHeaders() != null) + { + MultiValuedPropertyMap<Element> markupHeaders = fragmentResponse.getProperties() + .getMarkupHeaders(); + + List<Element> markupElements = markupHeaders.getValues(MimeResponse.MARKUP_HEAD_ELEMENT); + if (markupElements != null) + { + for (Element element : markupElements) + { + if ("title".equals(element.getNodeName().toLowerCase()) + && element.getFirstChild() != null) + { + String title = element.getFirstChild().getNodeValue(); + prcontext.getRequest().setAttribute(PortalRequestContext.REQUEST_TITLE, title); + } + else + { + prcontext.addExtraMarkupHeader(element); + } + } + } + } + } + + } + else + { + + PortletContainerException pcException; + + if (response instanceof ErrorResponse) + { + ErrorResponse errorResponse = (ErrorResponse)response; + pcException = + new PortletContainerException(errorResponse.getMessage(), errorResponse.getCause()); + } + else + { + pcException = + new PortletContainerException("Unknown invocation response type [" + response.getClass() + + "]. Expected a FragmentResponse or an ErrorResponse"); + } + + // + PortletExceptionHandleService portletExceptionService = uicomponent.getApplicationComponent(PortletExceptionHandleService.class); + if (portletExceptionService != null) + { + portletExceptionService.handle(pcException); + } + + // Log the error + log.error("Portlet render threw an exception", pcException); + + markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError")); + } + } + } + } + catch (Exception e) + { + PortletContainerException pcException = new PortletContainerException(e); + PortletExceptionHandleService portletExceptionService = uicomponent.getApplicationComponent(PortletExceptionHandleService.class); + if (portletExceptionService != null) + { + portletExceptionService.handle(pcException); + } + + // Log the error + log.error("Portlet render threw an exception", pcException); + + // + markup = Text.create(context.getApplicationResourceBundle().getString("UIPortlet.message.RuntimeError")); + } + + // + if (context.useAjax() && !prcontext.getFullRender()) + { + if (markup != null) + { + markup.writeTo(prcontext.getWriter()); + } + } + else + { + WebuiApplication app = (WebuiApplication)prcontext.getApplication(); + ApplicationResourceResolver resolver = app.getResourceResolver(); + WebuiBindingContext bcontext = new WebuiBindingContext(resolver, context.getWriter(), uicomponent, prcontext); + bcontext.put(UIComponent.UICOMPONENT, uicomponent); + bcontext.put("portletContent", markup); + try + { + renderTemplate(uicomponent.getTemplate(), bcontext); + } + catch (Throwable ex) + { + ex.printStackTrace(); + } + } + } +} Modified: epp/portal/tags/EPP_5_2_1_CR02/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/webui/portlet/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Property changes on: epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868 /portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4875,4894 /portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765 /portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871 /portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952 /portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063 /portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551 /portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916 /portal/branches/decoupled-webos/wsrp-integration:6214-6243 /portal/branches/gatein-management/wsrp-integration:6920-6958 /portal/branches/global-portlet-metadata/wsrp-integration:6298-6384 /portal/branches/site-describability/wsrp-integration:6171-6235 /portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868 /portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4875,4894 /portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765 /portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871 /portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952 /portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063 /portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551 /portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916 /portal/branches/decoupled-webos/wsrp-integration:6214-6243 /portal/branches/gatein-management/wsrp-integration:6920-6958 /portal/branches/global-portlet-metadata/wsrp-integration:6298-6384 /portal/branches/site-describability/wsrp-integration:6171-6235 /portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6665,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072 Modified: epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-component/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-config/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -26,7 +26,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>extension-config</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-ear/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -28,7 +28,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>extension-ear</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-ear-as5/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -27,7 +27,7 @@ <parent> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>extension-ear-as5</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/extension-war/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -27,7 +27,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <artifactId>extension-war</artifactId> Modified: epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2012-04-10 01:09:53 UTC (rev 8681) +++ epp/portal/tags/EPP_5_2_1_CR02/wsrp-integration/pom.xml 2012-04-10 14:31:28 UTC (rev 8683) @@ -34,7 +34,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.1-GA-SNAPSHOT</version> + <version>5.2.1.CR02</version> </parent> <description>GateIn WSRP Integration extension parent</description>