July 2011 - gatein-commits - Jboss List Archives

gatein SVN: r6839 - epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-07-07 09:22:44 -0400 (Thu, 07 Jul 2011) New Revision: 6839 Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java Log: JBEPP-984 Categories are not alphabetically sorted when adding portlet in category Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2011-07-07 13:17:42 UTC (rev 6838) +++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2011-07-07 13:22:44 UTC (rev 6839) @@ -4,6 +4,7 @@ import org.exoplatform.application.registry.Application; import org.exoplatform.application.registry.ApplicationCategory; import org.exoplatform.application.registry.ApplicationRegistryService; +import org.exoplatform.applicationregistry.webui.Util; import org.exoplatform.commons.utils.SerializablePageList; import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.webui.config.annotation.ComponentConfig; @@ -51,7 +52,7 @@ try { ApplicationRegistryService appRegService = getApplicationComponent(ApplicationRegistryService.class); - List<ApplicationCategory> categories = appRegService.getApplicationCategories(); + List<ApplicationCategory> categories = appRegService.getApplicationCategories(new Util.CategoryComparator()); categories = categories != null ? categories : new ArrayList<ApplicationCategory>(); return categories; }

13 years, 5 months

1
0
0 / 0

gatein SVN: r6838 - epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-07-07 09:17:42 -0400 (Thu, 07 Jul 2011) New Revision: 6838 Modified: epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java Log: GTNPORTAL-1348 Login page then username or password is incorrect shown as JSP source code. Modified: epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2011-07-07 13:11:15 UTC (rev 6837) +++ epp/portal/branches/EPP_5_1_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2011-07-07 13:17:42 UTC (rev 6838) @@ -65,6 +65,11 @@ unregisterTokenCookie(req); // Clear the token cookie clearTokenCookie(req, resp); + + //nguyenanhkien2a(a)gmail.com: We set content-type here for using RequestDispatcher.include() method below + //We can't use RequestDispatcher.forward() if we want to use some response information for output such as clearing cookies, etc + resp.setContentType("text/html; charset=UTF-8"); + // This allows the customer to define another login page without changing the portal context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); }

13 years, 5 months

1
0
0 / 0

gatein SVN: r6837 - in epp/portal/branches/EPP_5_1_Branch: component and 85 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-07-07 09:11:15 -0400 (Thu, 07 Jul 2011) New Revision: 6837 Modified: epp/portal/branches/EPP_5_1_Branch/component/application-registry/pom.xml epp/portal/branches/EPP_5_1_Branch/component/common/pom.xml epp/portal/branches/EPP_5_1_Branch/component/identity/pom.xml epp/portal/branches/EPP_5_1_Branch/component/management/pom.xml epp/portal/branches/EPP_5_1_Branch/component/pc/pom.xml epp/portal/branches/EPP_5_1_Branch/component/pom.xml epp/portal/branches/EPP_5_1_Branch/component/portal/pom.xml epp/portal/branches/EPP_5_1_Branch/component/resources/pom.xml epp/portal/branches/EPP_5_1_Branch/component/scripting/pom.xml epp/portal/branches/EPP_5_1_Branch/component/test/core/pom.xml epp/portal/branches/EPP_5_1_Branch/component/test/jcr/pom.xml epp/portal/branches/EPP_5_1_Branch/component/test/organization/pom.xml epp/portal/branches/EPP_5_1_Branch/component/test/pom.xml epp/portal/branches/EPP_5_1_Branch/component/web/api/pom.xml epp/portal/branches/EPP_5_1_Branch/component/web/controller/pom.xml epp/portal/branches/EPP_5_1_Branch/component/web/pom.xml epp/portal/branches/EPP_5_1_Branch/component/web/resources/pom.xml epp/portal/branches/EPP_5_1_Branch/component/web/security/pom.xml epp/portal/branches/EPP_5_1_Branch/component/web/server/pom.xml epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/examples/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/portletbridge/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/integration.war/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/extension/config/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/extension/ear/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/extension/jar/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/extension/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/extension/war/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portal/config/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portal/ear/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portal/jar/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portal/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portal/rest-war/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portal/war/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portlets/api/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsfhellouser/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsphellouser/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portlets/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portlets/simplesthelloworld/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/portlets/struts-jpetstore/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/skins/pom.xml epp/portal/branches/EPP_5_1_Branch/examples/skins/simpleskin/pom.xml epp/portal/branches/EPP_5_1_Branch/gadgets/core/pom.xml epp/portal/branches/EPP_5_1_Branch/gadgets/eXoGadgets/pom.xml epp/portal/branches/EPP_5_1_Branch/gadgets/pom.xml epp/portal/branches/EPP_5_1_Branch/gadgets/server/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/ear/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/integration.war/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pkg/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/module/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/pkg/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/product/pom.xml epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml epp/portal/branches/EPP_5_1_Branch/pom.xml epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/pom.xml epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/pom.xml epp/portal/branches/EPP_5_1_Branch/portlet/pom.xml epp/portal/branches/EPP_5_1_Branch/portlet/web/pom.xml epp/portal/branches/EPP_5_1_Branch/server/jboss/patch-ear/pom.xml epp/portal/branches/EPP_5_1_Branch/server/jboss/plugin/pom.xml epp/portal/branches/EPP_5_1_Branch/server/jboss/pom.xml epp/portal/branches/EPP_5_1_Branch/server/pom.xml epp/portal/branches/EPP_5_1_Branch/starter/ear/pom.xml epp/portal/branches/EPP_5_1_Branch/starter/jar/pom.xml epp/portal/branches/EPP_5_1_Branch/starter/pom.xml epp/portal/branches/EPP_5_1_Branch/starter/war/pom.xml epp/portal/branches/EPP_5_1_Branch/testsuite/pom.xml epp/portal/branches/EPP_5_1_Branch/testsuite/selenium-snifftests/pom.xml epp/portal/branches/EPP_5_1_Branch/testsuite/webuibasedsamples/pom.xml epp/portal/branches/EPP_5_1_Branch/web/eXoResources/pom.xml epp/portal/branches/EPP_5_1_Branch/web/pom.xml epp/portal/branches/EPP_5_1_Branch/web/portal/pom.xml epp/portal/branches/EPP_5_1_Branch/web/rest/pom.xml epp/portal/branches/EPP_5_1_Branch/webui/core/pom.xml epp/portal/branches/EPP_5_1_Branch/webui/dashboard/pom.xml epp/portal/branches/EPP_5_1_Branch/webui/eXo/pom.xml epp/portal/branches/EPP_5_1_Branch/webui/framework/pom.xml epp/portal/branches/EPP_5_1_Branch/webui/pom.xml epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml epp/portal/branches/EPP_5_1_Branch/webui/portlet/pom.xml Log: Version change to 5.1.1-epp-DEV03-SNAPSHOT Modified: epp/portal/branches/EPP_5_1_Branch/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/application-registry/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/application-registry/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/common/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/common/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/identity/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/identity/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/management/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/management/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/pc/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/pc/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/portal/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/portal/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/resources/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/resources/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/scripting/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/scripting/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/test/core/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/test/core/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/test/jcr/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/test/jcr/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/test/organization/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/test/organization/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/test/organization/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/test/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/test/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/api/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/web/api/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/controller/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/web/controller/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/web/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/resources/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/web/resources/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/security/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/web/security/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/server/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/web/server/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/examples/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/examples/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>distribution</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/portletbridge/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/portletbridge/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/gatein.ear/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/gatein.ear/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>gatein</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/integration.war/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/integration.war/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>integration</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/serverAddon/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/extension/config/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/extension/config/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/extension/ear/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/extension/ear/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,23 +37,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/extension/jar/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/extension/jar/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/extension/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/extension/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample.extension.root</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/extension/war/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/extension/war/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portal/config/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portal/config/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portal/ear/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portal/ear/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,29 +37,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portal/jar/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portal/jar/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portal/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portal/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample.portal.root</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portal/rest-war/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portal/rest-war/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portal/war/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portal/war/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portlets/api/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/api/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsfhellouser/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsfhellouser/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsphellouser/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/jsphellouser/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portlets/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <groupId>org.gatein.portal.examples.portlets</groupId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/skins/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/skins/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <groupId>org.gatein.portal.examples.skins</groupId> Modified: epp/portal/branches/EPP_5_1_Branch/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/skins/simpleskin/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/examples/skins/simpleskin/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/gadgets/core/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/gadgets/core/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/gadgets/eXoGadgets/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/gadgets/eXoGadgets/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/gadgets/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/gadgets/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/gadgets/server/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/gadgets/server/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/ear/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/ear/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> <packaging>ear</packaging> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/integration.war/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/integration.war/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> <packaging>war</packaging> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pkg/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pkg/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/jboss-as/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/module/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/module/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/module/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/pkg/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/pkg/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -67,13 +67,13 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>js</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/product/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/product/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/product/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <packaging>pom</packaging> <name>EPP GateIn - Portal - ${project.version}</name> @@ -363,68 +363,68 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -434,90 +434,90 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>gatein.portal.component.wsrp</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> Modified: epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/portlet/dashboard/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/portlet/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/web/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/portlet/web/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/server/jboss/patch-ear/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/server/jboss/patch-ear/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/server/jboss/plugin/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/server/jboss/plugin/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/server/jboss/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/server/jboss/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/server/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/server/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/starter/ear/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/starter/ear/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,7 +37,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_1_Branch/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/starter/jar/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/starter/jar/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/starter/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/starter/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/starter/war/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/starter/war/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -50,7 +50,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.jar</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: epp/portal/branches/EPP_5_1_Branch/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/testsuite/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/testsuite/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/testsuite/selenium-snifftests/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/testsuite/selenium-snifftests/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/testsuite/webuibasedsamples/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/testsuite/webuibasedsamples/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/eXoResources/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/web/eXoResources/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/web/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/portal/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/web/portal/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/rest/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/web/rest/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/core/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/webui/core/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/dashboard/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/webui/dashboard/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/eXo/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/webui/eXo/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/framework/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/webui/framework/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/webui/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/webui/portal/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_1_Branch/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portlet/pom.xml 2011-07-05 11:46:18 UTC (rev 6836) +++ epp/portal/branches/EPP_5_1_Branch/webui/portlet/pom.xml 2011-07-07 13:11:15 UTC (rev 6837) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.1.1-epp-DEV02</version> + <version>5.1.1-epp-DEV03-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>

13 years, 5 months

1
0
0 / 0

gatein SVN: r6836 - epp/portal/tags.

by do-not-reply＠jboss.org

Author: theute Date: 2011-07-05 07:46:18 -0400 (Tue, 05 Jul 2011) New Revision: 6836 Added: epp/portal/tags/EPP_5_2_0_Dev01/ Removed: epp/portal/tags/EPP_5.2.0-DEV01/ Log: renamed tag

13 years, 5 months

1
0
0 / 0

gatein SVN: r6835 - in portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource: compressor and 1 other directory.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-07-05 04:53:46 -0400 (Tue, 05 Jul 2011) New Revision: 6835 Added: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java Log: Add AbstractWebResourceTest to fix the failures in TestSkinService Added: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java (rev 0) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-07-05 08:53:46 UTC (rev 6835) @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2011 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.resource; + +import org.exoplatform.component.test.AbstractKernelTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; + +/** + * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> + * @date 7/5/11 + */ +@ConfiguredBy({ + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") +}) +public abstract class AbstractWebResourceTest extends AbstractKernelTest +{ +} Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-07-05 07:28:03 UTC (rev 6834) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-07-05 08:53:46 UTC (rev 6835) @@ -39,13 +39,7 @@ * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a> * @date 6/29/11 */ -@ConfiguredBy( - { - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml") , - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml") - } -) -public class TestSkinService extends AbstractKernelTest +public class TestSkinService extends AbstractWebResourceTest { private PortalContainer portalContainer; Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java =================================================================== --- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-07-05 07:28:03 UTC (rev 6834) +++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-07-05 08:53:46 UTC (rev 6835) @@ -29,6 +29,7 @@ import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.Parameter; import org.exoplatform.container.xml.ValueParam; +import org.exoplatform.portal.resource.AbstractWebResourceTest; import org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService; @@ -50,8 +51,7 @@ * @version $Revision$ */ -@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml")}) -public class TestResourceCompressorService extends AbstractKernelTest +public class TestResourceCompressorService extends AbstractWebResourceTest { public void testInitializing() {

13 years, 5 months

1
0
0 / 0

gatein SVN: r6834 - in epp/portal/branches/EPP_5_2_Branch: component and 86 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-07-05 03:28:03 -0400 (Tue, 05 Jul 2011) New Revision: 6834 Modified: epp/portal/branches/EPP_5_2_Branch/ epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pom.xml epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml epp/portal/branches/EPP_5_2_Branch/server/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml epp/portal/branches/EPP_5_2_Branch/web/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml Log: New SNAPSHOT version 5.2 DEV02 Property changes on: epp/portal/branches/EPP_5_2_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1822:5943 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1822:5943 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206 Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component: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:5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>distribution</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>gatein</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>integration</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,23 +38,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,29 +38,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Property changes on: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api ___________________________________________________________________ Added: svn:ignore + target Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> <packaging>ear</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> <packaging>war</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jboss-as</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -8,7 +8,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jetty.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.packaging.jetty</artifactId> <packaging>pom</packaging> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -67,13 +67,13 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>js</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <packaging>pom</packaging> <name>EPP GateIn - Portal - ${project.version}</name> @@ -368,68 +368,68 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -439,79 +439,79 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> @@ -522,7 +522,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</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.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</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.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) +++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-07-05 07:28:03 UTC (rev 6834) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>

13 years, 5 months

1
0
0 / 0

gatein SVN: r6833 - in epp/portal/tags: EPP_5.2.0-DEV01 and 91 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-07-05 03:17:38 -0400 (Tue, 05 Jul 2011) New Revision: 6833 Added: epp/portal/tags/EPP_5.2.0-DEV01/ epp/portal/tags/EPP_5.2.0-DEV01/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js epp/portal/tags/EPP_5.2.0-DEV01/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java Removed: epp/portal/tags/EPP_5.2.0-DEV01/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js epp/portal/tags/EPP_5.2.0-DEV01/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/ epp/portal/tags/EPP_5.2.0-DEV01/component/application-registry/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/common/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/identity/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/management/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/pc/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/portal/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/resources/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/scripting/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/test/core/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/test/jcr/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/test/organization/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/test/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/web/api/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/web/controller/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/web/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/web/resources/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/web/security/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/component/web/server/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/examples/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/portletbridge/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/integration.war/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/distribution/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/config/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/ear/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/jar/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/war/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/config/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/ear/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/jar/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/rest-war/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/war/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/api/ epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/api/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/jsfhellouser/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/jsphellouser/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/simplesthelloworld/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/struts-jpetstore/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/skins/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/examples/skins/simpleskin/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/gadgets/core/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/gadgets/eXoGadgets/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/gadgets/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/gadgets/server/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/ear/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/integration.war/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/pkg/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/jetty/pkg/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/jetty/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/module/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/pkg/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/product/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/packaging/reports/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/portlet/dashboard/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/portlet/exoadmin/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/portlet/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/patch-ear/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/plugin/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/server/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/starter/ear/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/starter/jar/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/starter/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/starter/war/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/testsuite/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/testsuite/selenium-snifftests/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/testsuite/webuibasedsamples/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/web/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/web/portal/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/web/rest/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/webui/core/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/webui/dashboard/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/webui/eXo/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/webui/framework/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/webui/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/webui/portal/pom.xml epp/portal/tags/EPP_5.2.0-DEV01/webui/portlet/pom.xml Log: Release 5.2.0-DEV01 Property changes on: epp/portal/tags/EPP_5.2.0-DEV01 ___________________________________________________________________ Added: svn:ignore + *.iml .idea Added: svn:mergeinfo + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1822:5943 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206 Property changes on: epp/portal/tags/EPP_5.2.0-DEV01/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component: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:5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206 Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/application-registry/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/common/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/identity/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/management/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/pc/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/portal/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5.2.0-DEV01/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2011-07-05 07:17:38 UTC (rev 6833) @@ -1,604 +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.config; - -import org.exoplatform.container.xml.InitParams; -import org.exoplatform.container.xml.ValueParam; -import org.exoplatform.container.xml.ValuesParam; -import org.exoplatform.portal.config.model.Page; -import org.exoplatform.portal.config.model.PageNavigation; -import org.exoplatform.portal.config.model.PortalConfig; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.exoplatform.services.security.ConversationState; -import org.exoplatform.services.security.Identity; -import org.exoplatform.services.security.IdentityConstants; -import org.exoplatform.services.security.MembershipEntry; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -/** Jun 27, 2006 */ -public class UserACL -{ - public final static String EVERYONE = "Everyone"; - - protected static Log log = ExoLogger.getLogger("organization:UserACL"); - - private final Collection<MembershipEntry> NO_MEMBERSHIP = Collections.emptyList(); - - private final Collection<String> NO_ROLES = Collections.emptyList(); - - private final Identity guest = new Identity(null, NO_MEMBERSHIP, NO_ROLES); - - private String superUser_; - - private String guestGroup_; - - private List<String> portalCreatorGroups_; - - private String navigationCreatorMembershipType_; - - private List<String> mandatoryGroups_; - - private List<String> mandatoryMSTypes_; - - private PortalACLPlugin portalACLPlugin; - - private String adminGroups; - - private String adminMSType; - - @SuppressWarnings("unchecked") - public UserACL(InitParams params) - { - UserACLMetaData md = new UserACLMetaData(params); - - ValuesParam mandatoryGroupsParam = params.getValuesParam("mandatory.groups"); - if (mandatoryGroupsParam != null) - { - mandatoryGroups_ = mandatoryGroupsParam.getValues(); - } - else - { - mandatoryGroups_ = new ArrayList<String>(); - } - - ValuesParam mandatoryMSTypesParam = params.getValuesParam("mandatory.mstypes"); - if (mandatoryMSTypesParam != null) - mandatoryMSTypes_ = mandatoryMSTypesParam.getValues(); - else - mandatoryMSTypes_ = new ArrayList<String>(); - - // tam.nguyen get admin group value - ValueParam adminGroupsParam = params.getValueParam("portal.administrator.groups"); - if (adminGroupsParam != null) - { - setAdminGroups(adminGroupsParam.getValue()); - } - - // tam.nguyen get administrator member type - ValueParam adminMSTypeParam = params.getValueParam("portal.administrator.mstype"); - if (adminMSTypeParam != null) - { - setAdminMSType(adminMSTypeParam.getValue()); - } - - init(md); - } - - public UserACL(UserACLMetaData md) - { - if (md == null) - { - throw new NullPointerException("No meta data provided"); - } - init(md); - } - - private void init(UserACLMetaData md) - { - if (md.getSuperUser() != null) - { - superUser_ = md.getSuperUser(); - } - if (superUser_ == null || superUser_.trim().length() == 0) - { - superUser_ = "root"; - } - - if (md.getGuestsGroups() != null) - { - guestGroup_ = md.getGuestsGroups(); - } - if (guestGroup_ == null || guestGroup_.trim().length() < 1) - { - guestGroup_ = "/platform/guests"; - } - - if (md.getNavigationCreatorMembershipType() != null) - { - navigationCreatorMembershipType_ = md.getNavigationCreatorMembershipType(); - } - if (navigationCreatorMembershipType_ == null || navigationCreatorMembershipType_.trim().length() == 0) - { - navigationCreatorMembershipType_ = "owner"; - } - - String allGroups = ""; - if (md.getPortalCreateGroups() != null) - { - allGroups = md.getPortalCreateGroups(); - } - portalCreatorGroups_ = defragmentPermission(allGroups); - } - - // TODO: unnecessary to keep potalACLPlugin - public void addPortalACLPlugin(PortalACLPlugin plugin) - { - this.portalACLPlugin = plugin; - String superUser = portalACLPlugin.getSuperUser(); - if (superUser != null) - { - log.info("Overidden SuperUser by PortalACLPlugin"); - superUser_ = superUser; - } - List<String> portalCreationRoles = portalACLPlugin.getPortalCreationRoles(); - if (portalCreationRoles != null) - { - log.info("Overidden PortalCreatorGroup by PortalACLPlugin"); - portalCreatorGroups_ = portalCreationRoles; - } - } - - public String getMakableMT() - { - return navigationCreatorMembershipType_; - } - - public List<String> getPortalCreatorGroups() - { - return portalCreatorGroups_; - } - - public String getSuperUser() - { - return superUser_; - } - - public String getGuestsGroup() - { - return guestGroup_; - } - - public List<String> getMandatoryGroups() - { - return mandatoryGroups_; - } - - public List<String> getMandatoryMSTypes() - { - return mandatoryMSTypes_; - } - - public void setAdminGroups(String adminGroups) - { - this.adminGroups = adminGroups; - } - - public String getAdminGroups() - { - return adminGroups; - } - - public void setAdminMSType(String adminMSType) - { - this.adminMSType = adminMSType; - } - - public String getAdminMSType() - { - return adminMSType; - } - - public boolean hasPermission(PortalConfig pconfig) - { - Identity identity = getIdentity(); - if (hasPermission(identity, pconfig.getEditPermission())) - { - pconfig.setModifiable(true); - return true; - } - pconfig.setModifiable(false); - String[] accessPerms = (pconfig.getAccessPermissions()); - for (String per : accessPerms) - { - if (hasPermission(identity, per)) - { - return true; - } - } - return false; - } - - public boolean hasEditPermission(PortalConfig pconfig) - { - return hasPermission(getIdentity(), pconfig.getEditPermission()); - } - - /** - * This method is equivalent to <code>hasEditPermission(PortalConfig)</code>. That allows us - * to check edit permission on a UIPortal, without converting UIPortal into PortalConfig via - * PortalDataMapper. - * - * @param ownerType the owner type - * @param ownerId the owner id - * @param editPermExpression the permission expression - * @return true or false - */ - public boolean hasEditPermissionOnPortal(String ownerType, String ownerId, String editPermExpression) - { - Identity identity = this.getIdentity(); - if(superUser_.equals(identity.getUserId())) - { - return true; - } - - if(PortalConfig.USER_TYPE.equals(ownerType)){ - return identity.getUserId().equals(ownerId); - } - - return hasPermission(identity, editPermExpression); - } - - public boolean hasCreatePortalPermission() - { - Identity identity = getIdentity(); - if (superUser_.equals(identity.getUserId())) - { - return true; - } - if (portalCreatorGroups_ == null || portalCreatorGroups_.size() < 1) - { - return false; - } - for (String ele : portalCreatorGroups_) - { - if (hasPermission(identity, ele)) - { - return true; - } - } - return false; - } - - public boolean hasEditPermission(PageNavigation pageNav) - { - Identity identity = getIdentity(); - if (superUser_.equals(identity.getUserId())) - { - pageNav.setModifiable(true); - return true; - } - String ownerType = pageNav.getOwnerType(); - - if (PortalConfig.GROUP_TYPE.equals(ownerType)) - { - String temp = pageNav.getOwnerId().trim(); - String expAdminGroup = getAdminGroups(); - String expPerm = null; - - // Check to see whether current user is member of admin group or not, - // if so grant - // edit permission for group navigation for that user. - if (expAdminGroup != null) - { - expAdminGroup = expAdminGroup.startsWith("/") ? expAdminGroup : "/" + expAdminGroup; - expPerm = temp.startsWith("/") ? temp : "/" + temp; - if (isUserInGroup(expPerm) && isUserInGroup(expAdminGroup)) - { - return true; - } - } - - expPerm = navigationCreatorMembershipType_ + (temp.startsWith("/") ? ":" + temp : ":/" + temp); - return hasPermission(identity, expPerm); - } - else if (PortalConfig.USER_TYPE.equals(ownerType)) - { - return pageNav.getOwnerId().equals(identity.getUserId()); - } - return false; - } - - public boolean hasPermission(Page page) - { - Identity identity = getIdentity(); - if (PortalConfig.USER_TYPE.equals(page.getOwnerType())) - { - if (page.getOwnerId().equals(identity.getUserId())) - { - page.setModifiable(true); - return true; - } - } - if (superUser_.equals(identity.getUserId())) - { - page.setModifiable(true); - return true; - } - if (hasEditPermission(page)) - { - page.setModifiable(true); - return true; - } - page.setModifiable(false); - String[] accessPerms = page.getAccessPermissions(); - if (accessPerms != null) - { - for (String per : accessPerms) - { - if (hasPermission(identity, per)) - { - return true; - } - } - } - return false; - } - - public boolean hasEditPermission(Page page) - { - Identity identity = getIdentity(); - if (PortalConfig.USER_TYPE.equals(page.getOwnerType())) - { - if (page.getOwnerId().equals(identity.getUserId())) - { - page.setModifiable(true); - return true; - } - return false; - } - if (hasPermission(identity, page.getEditPermission())) - { - page.setModifiable(true); - return true; - } - page.setModifiable(false); - return false; - } - - /** - * - * Minh Hoang TO - This method is equivalent to - * <code>hasEditPermission(Page)</code>. It allows us to check edit - * permission with a UIPage, without converting UIPage into Page via - * PortalDataMapper - * - */ - public boolean hasEditPermissionOnPage(String ownerType, String ownerId, String editPermExpression) - { - Identity identity = this.getIdentity(); - - if (PortalConfig.USER_TYPE.equals(ownerType)) - { - if (ownerId.equals(identity.getUserId())) - { - return true; - } - return false; - } - - return hasPermission(identity, editPermExpression); - } - - public boolean hasPermission(String expPerm) - { - return hasPermission(getIdentity(), expPerm); - } - - /** - * @param group - * @return - */ - public boolean isUserInGroup(String group) - { - ConversationState conv = ConversationState.getCurrent(); - Identity id = null; - if (conv != null) - { - id = conv.getIdentity(); - } - - if (id == null) - { - return false; - } - - Iterator<String> iter = id.getGroups().iterator(); - - while (iter.hasNext()) - { - if (iter.next().equals(group)) - { - return true; - } - } - - return false; - } - - private Identity getIdentity() - { - ConversationState conv = ConversationState.getCurrent(); - if (conv == null) - { - return guest; - } - - Identity id = conv.getIdentity(); - if (id == null) - { - return guest; - } - - return id; - } - - public boolean hasPermission(Identity identity, String expPerm) - { - String currentUser = identity.getUserId(); - if (superUser_.equals(currentUser)) - { - return true; - } - if (expPerm == null) - { - return false; - } - if (EVERYONE.equals(expPerm)) - { - return true; - } - Permission permission = new Permission(); - permission.setPermissionExpression(expPerm); - String groupId = permission.getGroupId(); - if ((currentUser == null || currentUser.equals(IdentityConstants.ANONIM)) && groupId.equals(guestGroup_)) - { - return true; - } - String membership = permission.getMembership(); - return identity.isMemberOf(groupId, membership); - } - - private List<String> defragmentPermission(String permission) - { - List<String> result = new ArrayList<String>(); - if (permission != null) - { - if (permission.contains(",")) - { - String[] groups = permission.split(","); - for (String group : groups) - { - result.add(group.trim()); - } - } - else - { - result.add(permission); - } - } - return result; - } - - static public class Permission implements Serializable - { - - private String name_; - - private String groupId_ = ""; - - private String membership_ = ""; - - private String expression; - - private boolean selected_ = false; - - public void setPermissionExpression(String exp) - { - if (exp == null || exp.length() == 0) - { - return; - } - String[] temp = exp.split(":"); - if (temp.length < 2) - { - return; - } - expression = exp; - membership_ = temp[0].trim(); - groupId_ = temp[1].trim(); - } - - public String getGroupId() - { - return groupId_; - } - - public void setGroupId(String groupId) - { - groupId_ = groupId; - } - - public String getName() - { - return name_; - } - - public void setName(String name) - { - name_ = name; - } - - public String getValue() - { - if (membership_.length() == 0 || groupId_.length() == 0) - { - return null; - } - return membership_ + ":" + groupId_; - } - - public String getMembership() - { - return membership_; - } - - public void setMembership(String membership) - { - membership_ = membership; - } - - public boolean isSelected() - { - return selected_; - } - - public void setSelected(boolean selected) - { - selected_ = selected; - } - - public String getExpression() - { - return expression; - } - - public void setExpression(String expression) - { - this.expression = expression; - } - } -} Copied: epp/portal/tags/EPP_5.2.0-DEV01/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java (from rev 6814, epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java) =================================================================== --- epp/portal/tags/EPP_5.2.0-DEV01/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java (rev 0) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/portal/src/main/java/org/exoplatform/portal/config/UserACL.java 2011-07-05 07:17:38 UTC (rev 6833) @@ -0,0 +1,604 @@ +/** + * 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.config; + +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.ValueParam; +import org.exoplatform.container.xml.ValuesParam; +import org.exoplatform.portal.config.model.Page; +import org.exoplatform.portal.config.model.PageNavigation; +import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.exoplatform.services.security.ConversationState; +import org.exoplatform.services.security.Identity; +import org.exoplatform.services.security.IdentityConstants; +import org.exoplatform.services.security.MembershipEntry; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +/** Jun 27, 2006 */ +public class UserACL +{ + public final static String EVERYONE = "Everyone"; + + protected static Log log = ExoLogger.getLogger("organization:UserACL"); + + private final Collection<MembershipEntry> NO_MEMBERSHIP = Collections.emptyList(); + + private final Collection<String> NO_ROLES = Collections.emptyList(); + + private final Identity guest = new Identity(null, NO_MEMBERSHIP, NO_ROLES); + + private String superUser_; + + private String guestGroup_; + + private List<String> portalCreatorGroups_; + + private String navigationCreatorMembershipType_; + + private List<String> mandatoryGroups_; + + private List<String> mandatoryMSTypes_; + + private PortalACLPlugin portalACLPlugin; + + private String adminGroups; + + private String adminMSType; + + @SuppressWarnings("unchecked") + public UserACL(InitParams params) + { + UserACLMetaData md = new UserACLMetaData(params); + + ValuesParam mandatoryGroupsParam = params.getValuesParam("mandatory.groups"); + if (mandatoryGroupsParam != null) + { + mandatoryGroups_ = mandatoryGroupsParam.getValues(); + } + else + { + mandatoryGroups_ = new ArrayList<String>(); + } + + ValuesParam mandatoryMSTypesParam = params.getValuesParam("mandatory.mstypes"); + if (mandatoryMSTypesParam != null) + mandatoryMSTypes_ = mandatoryMSTypesParam.getValues(); + else + mandatoryMSTypes_ = new ArrayList<String>(); + + // tam.nguyen get admin group value + ValueParam adminGroupsParam = params.getValueParam("portal.administrator.groups"); + if (adminGroupsParam != null) + { + setAdminGroups(adminGroupsParam.getValue()); + } + + // tam.nguyen get administrator member type + ValueParam adminMSTypeParam = params.getValueParam("portal.administrator.mstype"); + if (adminMSTypeParam != null) + { + setAdminMSType(adminMSTypeParam.getValue()); + } + + init(md); + } + + public UserACL(UserACLMetaData md) + { + if (md == null) + { + throw new NullPointerException("No meta data provided"); + } + init(md); + } + + private void init(UserACLMetaData md) + { + if (md.getSuperUser() != null) + { + superUser_ = md.getSuperUser(); + } + if (superUser_ == null || superUser_.trim().length() == 0) + { + superUser_ = "root"; + } + + if (md.getGuestsGroups() != null) + { + guestGroup_ = md.getGuestsGroups(); + } + if (guestGroup_ == null || guestGroup_.trim().length() < 1) + { + guestGroup_ = "/platform/guests"; + } + + if (md.getNavigationCreatorMembershipType() != null) + { + navigationCreatorMembershipType_ = md.getNavigationCreatorMembershipType(); + } + if (navigationCreatorMembershipType_ == null || navigationCreatorMembershipType_.trim().length() == 0) + { + navigationCreatorMembershipType_ = "owner"; + } + + String allGroups = ""; + if (md.getPortalCreateGroups() != null) + { + allGroups = md.getPortalCreateGroups(); + } + portalCreatorGroups_ = defragmentPermission(allGroups); + } + + // TODO: unnecessary to keep potalACLPlugin + public void addPortalACLPlugin(PortalACLPlugin plugin) + { + this.portalACLPlugin = plugin; + String superUser = portalACLPlugin.getSuperUser(); + if (superUser != null) + { + log.info("Overidden SuperUser by PortalACLPlugin"); + superUser_ = superUser; + } + List<String> portalCreationRoles = portalACLPlugin.getPortalCreationRoles(); + if (portalCreationRoles != null) + { + log.info("Overidden PortalCreatorGroup by PortalACLPlugin"); + portalCreatorGroups_ = portalCreationRoles; + } + } + + public String getMakableMT() + { + return navigationCreatorMembershipType_; + } + + public List<String> getPortalCreatorGroups() + { + return portalCreatorGroups_; + } + + public String getSuperUser() + { + return superUser_; + } + + public String getGuestsGroup() + { + return guestGroup_; + } + + public List<String> getMandatoryGroups() + { + return mandatoryGroups_; + } + + public List<String> getMandatoryMSTypes() + { + return mandatoryMSTypes_; + } + + public void setAdminGroups(String adminGroups) + { + this.adminGroups = adminGroups; + } + + public String getAdminGroups() + { + return adminGroups; + } + + public void setAdminMSType(String adminMSType) + { + this.adminMSType = adminMSType; + } + + public String getAdminMSType() + { + return adminMSType; + } + + public boolean hasPermission(PortalConfig pconfig) + { + Identity identity = getIdentity(); + if (hasPermission(identity, pconfig.getEditPermission())) + { + pconfig.setModifiable(true); + return true; + } + pconfig.setModifiable(false); + String[] accessPerms = (pconfig.getAccessPermissions()); + for (String per : accessPerms) + { + if (hasPermission(identity, per)) + { + return true; + } + } + return false; + } + + public boolean hasEditPermission(PortalConfig pconfig) + { + return hasPermission(getIdentity(), pconfig.getEditPermission()); + } + + /** + * This method is equivalent to <code>hasEditPermission(PortalConfig)</code>. That allows us + * to check edit permission on a UIPortal, without converting UIPortal into PortalConfig via + * PortalDataMapper. + * + * @param ownerType the owner type + * @param ownerId the owner id + * @param editPermExpression the permission expression + * @return true or false + */ + public boolean hasEditPermissionOnPortal(String ownerType, String ownerId, String editPermExpression) + { + Identity identity = this.getIdentity(); + if(superUser_.equals(identity.getUserId())) + { + return true; + } + + if(PortalConfig.USER_TYPE.equals(ownerType)){ + return identity.getUserId().equals(ownerId); + } + + return hasPermission(identity, editPermExpression); + } + + public boolean hasCreatePortalPermission() + { + Identity identity = getIdentity(); + if (superUser_.equals(identity.getUserId())) + { + return true; + } + if (portalCreatorGroups_ == null || portalCreatorGroups_.size() < 1) + { + return false; + } + for (String ele : portalCreatorGroups_) + { + if (hasPermission(identity, ele)) + { + return true; + } + } + return false; + } + + public boolean hasEditPermission(PageNavigation pageNav) + { + Identity identity = getIdentity(); + if (superUser_.equals(identity.getUserId())) + { + pageNav.setModifiable(true); + return true; + } + String ownerType = pageNav.getOwnerType(); + + if (PortalConfig.GROUP_TYPE.equals(ownerType)) + { + String temp = pageNav.getOwnerId().trim(); + String expAdminGroup = getAdminGroups(); + String expPerm = null; + + // Check to see whether current user is member of admin group or not, + // if so grant + // edit permission for group navigation for that user. + if (expAdminGroup != null) + { + expAdminGroup = expAdminGroup.startsWith("/") ? expAdminGroup : "/" + expAdminGroup; + expPerm = temp.startsWith("/") ? temp : "/" + temp; + if (isUserInGroup(expPerm) && isUserInGroup(expAdminGroup)) + { + return true; + } + } + + expPerm = navigationCreatorMembershipType_ + (temp.startsWith("/") ? ":" + temp : ":/" + temp); + return hasPermission(identity, expPerm); + } + else if (PortalConfig.USER_TYPE.equals(ownerType)) + { + return pageNav.getOwnerId().equals(identity.getUserId()); + } + return false; + } + + public boolean hasPermission(Page page) + { + Identity identity = getIdentity(); + if (PortalConfig.USER_TYPE.equals(page.getOwnerType())) + { + if (page.getOwnerId().equals(identity.getUserId())) + { + page.setModifiable(true); + return true; + } + } + if (superUser_.equals(identity.getUserId())) + { + page.setModifiable(true); + return true; + } + if (hasEditPermission(page)) + { + page.setModifiable(true); + return true; + } + page.setModifiable(false); + String[] accessPerms = page.getAccessPermissions(); + if (accessPerms != null) + { + for (String per : accessPerms) + { + if (hasPermission(identity, per)) + { + return true; + } + } + } + return false; + } + + public boolean hasEditPermission(Page page) + { + Identity identity = getIdentity(); + if (PortalConfig.USER_TYPE.equals(page.getOwnerType())) + { + if (page.getOwnerId().equals(identity.getUserId())) + { + page.setModifiable(true); + return true; + } + return false; + } + if (hasPermission(identity, page.getEditPermission())) + { + page.setModifiable(true); + return true; + } + page.setModifiable(false); + return false; + } + + /** + * + * Minh Hoang TO - This method is equivalent to + * <code>hasEditPermission(Page)</code>. It allows us to check edit + * permission with a UIPage, without converting UIPage into Page via + * PortalDataMapper + * + */ + public boolean hasEditPermissionOnPage(String ownerType, String ownerId, String editPermExpression) + { + Identity identity = this.getIdentity(); + + if (PortalConfig.USER_TYPE.equals(ownerType)) + { + if (ownerId.equals(identity.getUserId())) + { + return true; + } + return false; + } + + return hasPermission(identity, editPermExpression); + } + + public boolean hasPermission(String expPerm) + { + return hasPermission(getIdentity(), expPerm); + } + + /** + * @param group + * @return + */ + public boolean isUserInGroup(String group) + { + ConversationState conv = ConversationState.getCurrent(); + Identity id = null; + if (conv != null) + { + id = conv.getIdentity(); + } + + if (id == null) + { + return false; + } + + Iterator<String> iter = id.getGroups().iterator(); + + while (iter.hasNext()) + { + if (iter.next().equals(group)) + { + return true; + } + } + + return false; + } + + private Identity getIdentity() + { + ConversationState conv = ConversationState.getCurrent(); + if (conv == null) + { + return guest; + } + + Identity id = conv.getIdentity(); + if (id == null) + { + return guest; + } + + return id; + } + + public boolean hasPermission(Identity identity, String expPerm) + { + String currentUser = identity.getUserId(); + if (superUser_.equals(currentUser)) + { + return true; + } + if (expPerm == null) + { + return false; + } + if (EVERYONE.equals(expPerm)) + { + return true; + } + Permission permission = new Permission(); + permission.setPermissionExpression(expPerm); + String groupId = permission.getGroupId(); + if ((currentUser == null || currentUser.equals(IdentityConstants.ANONIM)) && groupId.equals(guestGroup_)) + { + return true; + } + String membership = permission.getMembership(); + return identity.isMemberOf(groupId, membership); + } + + private List<String> defragmentPermission(String permission) + { + List<String> result = new ArrayList<String>(); + if (permission != null) + { + if (permission.contains(",")) + { + String[] groups = permission.split(","); + for (String group : groups) + { + result.add(group.trim()); + } + } + else + { + result.add(permission); + } + } + return result; + } + + static public class Permission implements Serializable + { + + private String name_; + + private String groupId_ = ""; + + private String membership_ = ""; + + private String expression; + + private boolean selected_ = false; + + public void setPermissionExpression(String exp) + { + if (exp == null || exp.length() == 0) + { + return; + } + String[] temp = exp.split(":"); + if (temp.length < 2) + { + return; + } + expression = exp; + membership_ = temp[0].trim(); + groupId_ = temp[1].trim(); + } + + public String getGroupId() + { + return groupId_; + } + + public void setGroupId(String groupId) + { + groupId_ = groupId; + } + + public String getName() + { + return name_; + } + + public void setName(String name) + { + name_ = name; + } + + public String getValue() + { + if (membership_.length() == 0 || groupId_.length() == 0) + { + return null; + } + return membership_ + ":" + groupId_; + } + + public String getMembership() + { + return membership_; + } + + public void setMembership(String membership) + { + membership_ = membership; + } + + public boolean isSelected() + { + return selected_; + } + + public void setSelected(boolean selected) + { + selected_ = selected; + } + + public String getExpression() + { + return expression; + } + + public void setExpression(String expression) + { + this.expression = expression; + } + } +} Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/resources/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/scripting/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/test/core/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/test/jcr/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/test/organization/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/organization/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/test/organization/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/test/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/web/api/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/web/controller/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/web/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/web/resources/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/web/security/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/component/web/server/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/examples/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../pom.xml</relativePath> </parent> Deleted: epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -1,181 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.portal</groupId> - <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </parent> - - <artifactId>distribution</artifactId> - <packaging>pom</packaging> - <name>Distribution</name> - - <modules> - <module>serverAddon</module> - <module>portletbridge</module> - <module>examples</module> - </modules> - - <dependencies> - <dependency> - <groupId>org.exoplatform.portal.distribution.root</groupId> - <artifactId>portletbridge</artifactId> - <version>${project.version}</version> - <type>zip</type> - </dependency> - - <dependency> - <groupId>org.gatein.sso</groupId> - <artifactId>sso-packaging</artifactId> - <version>${sso.version}</version> - <type>zip</type> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal.distribution.deploy</groupId> - <artifactId>serverAddon</artifactId> - <version>${project.version}</version> - <type>zip</type> - </dependency> - - <dependency> - <groupId>org.exoplatform.portal.distribution</groupId> - <artifactId>examples</artifactId> - <version>${project.version}</version> - <type>zip</type> - </dependency> - -  - <dependency> - <groupId>${eap.groupId}</groupId> - <artifactId>jboss-eap</artifactId> - <version>${eap.version}</version> - <type>zip</type> - </dependency> - - </dependencies> - - - <build> - <finalName>jboss-epp-${project.version}</finalName> - <plugins> - </plugins> - </build> - - <profiles> - <profile> - <id>epp-distribution-assembly</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly</id> - <phase>compile</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/assemble.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>epp-distribution-patch</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> -  - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <id>ant-final</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <property name="epp.path">${project.build.directory}/${project.build.finalName}/${epp.dir}</property> - <property name="eap.path">${project.build.directory}/${project.build.finalName}/${eap.dir}</property> - - <move file="${eap.path}" toFile="${epp.path}"/> - <move file="${epp.path}/gatein-sso-${sso.version}" toFile="${epp.path}/${sso.directory}"/> - - <ant antfile="src/build.xml" inheritRefs="true"> - <target name="patch"/> - <property name="toConfiguration" value="default"/> - </ant> - - <ant antfile="src/build.xml" inheritRefs="true"> - <target name="patch"/> - <property name="toConfiguration" value="production"/> - </ant> - - <ant antfile="src/build.xml" inheritRefs="true"> - <target name="patch"/> - <property name="toConfiguration" value="all"/> - </ant> - - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>epp-distribution-zip</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distro-assembly-zip</id> - <phase>packaging</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/zip.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> \ No newline at end of file Copied: epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/pom.xml (from rev 6831, epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml) =================================================================== --- epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/pom.xml (rev 0) +++ epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -0,0 +1,181 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>distribution.parent</artifactId> + <version>5.2.0-epp-DEV01</version> + </parent> + + <artifactId>distribution</artifactId> + <packaging>pom</packaging> + <name>Distribution</name> + + <modules> + <module>serverAddon</module> + <module>portletbridge</module> + <module>examples</module> + </modules> + + <dependencies> + <dependency> + <groupId>org.exoplatform.portal.distribution.root</groupId> + <artifactId>portletbridge</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-packaging</artifactId> + <version>${sso.version}</version> + <type>zip</type> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal.distribution.deploy</groupId> + <artifactId>serverAddon</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal.distribution</groupId> + <artifactId>examples</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + +  + <dependency> + <groupId>${eap.groupId}</groupId> + <artifactId>jboss-eap</artifactId> + <version>${eap.version}</version> + <type>zip</type> + </dependency> + + </dependencies> + + + <build> + <finalName>jboss-epp-${project.version}</finalName> + <plugins> + </plugins> + </build> + + <profiles> + <profile> + <id>epp-distribution-assembly</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>epp-distribution-patch</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> +  + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>ant-final</id> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <property name="epp.path">${project.build.directory}/${project.build.finalName}/${epp.dir}</property> + <property name="eap.path">${project.build.directory}/${project.build.finalName}/${eap.dir}</property> + + <move file="${eap.path}" toFile="${epp.path}"/> + <move file="${epp.path}/gatein-sso-${sso.version}" toFile="${epp.path}/${sso.directory}"/> + + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="default"/> + </ant> + + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="production"/> + </ant> + + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="all"/> + </ant> + + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>epp-distribution-zip</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly-zip</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/zip.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> \ No newline at end of file Modified: epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/portletbridge/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>gatein</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>integration</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/distribution/jboss-epp/serverAddon/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/distribution/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/config/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,23 +38,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/jar/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/extension/war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/config/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,29 +38,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/jar/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/rest-war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portal/war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../../pom.xml</relativePath> </parent> Property changes on: epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/api ___________________________________________________________________ Added: svn:ignore + target Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/api/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/jsfhellouser/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/jsphellouser/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/simplesthelloworld/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/portlets/struts-jpetstore/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/skins/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/examples/skins/simpleskin/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/gadgets/core/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/gadgets/eXoGadgets/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/gadgets/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/gadgets/server/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/ear/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> <packaging>ear</packaging> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/integration.war/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/integration.war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> <packaging>war</packaging> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pkg/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/pkg/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.packaging.jboss-as.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jboss-as/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/jboss-as/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.packaging.jboss-as</artifactId> <packaging>pom</packaging> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/jetty/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/jetty/pkg/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -8,7 +8,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.packaging.jetty.pkg</artifactId> <packaging>pom</packaging> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/jetty/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/jetty/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.packaging.jetty</artifactId> <packaging>pom</packaging> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/module/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/module/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/module/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/pkg/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/pkg/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/pkg/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -67,13 +67,13 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <type>js</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/product/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/product/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/product/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/packaging/reports/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/packaging/reports/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/packaging/reports/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5.2.0-DEV01/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -1,1156 +0,0 @@ - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.gatein</groupId> - <artifactId>gatein-parent</artifactId> - <version>1.0.2-GA</version> - </parent> - - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>EPP GateIn - Portal - ${project.version}</name> - - <properties> - <org.exoplatform.kernel.version>2.3.0-CR2</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.4.0-CR2</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.2.0-CR2</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.14.0-CR2</org.exoplatform.jcr.version> - <org.jibx.version>1.2.1</org.jibx.version> - <org.shindig.version>1.0-r790473-Patch06</org.shindig.version> - <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> - <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> - <org.gatein.wci.version>2.1.0-Beta04</org.gatein.wci.version> - <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version> - <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> - <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> - <org.gatein.mop.version>1.1.0-Beta02</org.gatein.mop.version> - <org.slf4j.version>1.5.6</org.slf4j.version> - <rhino.version>1.6R5</rhino.version> - <org.codehaus.groovy.version>1.7.6</org.codehaus.groovy.version> - <javax.servlet.version>2.5</javax.servlet.version> - <version.chromattic>1.1.0-beta5</version.chromattic> - <version.reflect>1.1.0-beta12</version.reflect> - <jcip.version>1.0</jcip.version> - -  -  -  - -  - <jdk.min.version>1.6</jdk.min.version> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_1...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_1_Branch</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_1_Branch</url> - </scm> - - <modules> - <module>component</module> - <module>gadgets</module> - <module>webui</module> - <module>portlet</module> - <module>web</module> - <module>server</module> - <module>examples</module> - <module>starter</module> - <module>packaging</module> - <module>testsuite</module> - <module>distribution</module> - </modules> - - <dependencyManagement> - <dependencies> - -  - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-int</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.mc-kernel-extras</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.ldap</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <version>${org.exoplatform.core.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.ldap</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.core</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.webdav</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.web</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ftp</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - -  - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-logging</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-exo</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat6</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat7</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-jetty</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-bridge</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-federation</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-controller</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <version>${org.gatein.wsrp.version}</version> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-api</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-spi</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-core</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> - -  - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.common</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.xml-parser</artifactId> - <version>5.1.0-epp-ER01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.management</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.component.test.organization</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>gatein.portal.component.wsrp</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.server.tomcat.plugin</artifactId> - <version>5.1.0-epp-ER01-SNAPSHOT</version> - </dependency> - -  - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.apt</artifactId> - <version>${version.chromattic}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.api</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.spi</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.core</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.ext</artifactId> - <version>${version.chromattic}</version> - </dependency> - -  - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-core</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-hibernate</artifactId> - <version>${org.picketlink.idm}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-ldap</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-cache</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-tomcat</artifactId> - <version>5.1.0.GA</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> - </dependency> - <dependency> - <groupId>commons-chain</groupId> - <artifactId>commons-chain</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.5.5</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.4</version> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.7</version> - </dependency> - - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20070829</version> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${javax.servlet.version}</version> - </dependency> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>${rhino.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${org.codehaus.groovy.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> - </dependency> - - <dependency> - <groupId>caja</groupId> - <artifactId>caja</artifactId> - <version>r3375</version> - </dependency> - <dependency> - <groupId>caja</groupId> - <artifactId>json_simple</artifactId> - <version>r1</version> - </dependency> - <dependency> - <groupId>net.oauth</groupId> - <artifactId>core</artifactId> - <version>20080621</version> - </dependency> - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0-rc2</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>0.9</version> - </dependency> - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>3.8</version> - </dependency> - <dependency> - <groupId>net.sourceforge.nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.9</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>nu.validator.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.0.7</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-features</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-common</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.shindig</groupId> - <artifactId>shindig-social-api</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.captcha</groupId> - <artifactId>simplecaptcha</artifactId> - <version>${nl.captcha.simplecaptcha.version}</version> - </dependency> -  - <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>${jcip.version}</version> - </dependency> - - </dependencies> - - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>${org.slf4j.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xsd</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.*</include> - </includes> - </testResource> - </testResources> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.1.1</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Xms512m -Xmx512m</argLine> - <systemProperties> - <property> - <name>org.apache.commons.logging.Log</name> - <value>org.apache.commons.logging.impl.SimpleLog</value> - </property> - <property> - <name>org.apache.commons.logging.simplelog.defaultlog</name> - <value>info</value> - </property> - <property> - <name>org.apache.commons.logging.simplelog.log.[eXo]</name> - <value>debug</value> - </property> - <property> - <name>org.apache.commons.logging.simplelog.log.net.hibernate</name> - <value>warn</value> - </property> - <property> - <name>java.naming.factory.initial</name> - <value>org.exoplatform.services.naming.SimpleContextFactory</value> - </property> - </systemProperties> - </configuration> - </plugin> -  -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>true</fork> - <meminitial>256m</meminitial> - <maxmem>1024m</maxmem> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>compile</id> - <phase>compile</phase> - <configuration> - <tasks> - <copy failonerror="false" todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> - <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes"> - <include name="**/*_en.properties" /> - </fileset> - <globmapper from="*_en.properties" to="*.properties" /> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>hsqldb</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.util.logging.config.class</name> - <value>org.exoplatform.component.test.logging.LogConfigurator</value> - </property> - <property> - <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>gatein.test.datasource.driver</name> - <value>org.hsqldb.jdbcDriver</value> - </property> - <property> - <name>gatein.test.datasource.url</name> - <value>jdbc:hsqldb:mem:gateindb</value> - </property> - <property> - <name>gatein.test.datasource.username</name> - <value>sa</value> - </property> - <property> - <name>gatein.test.datasource.password</name> - <value /> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>mysql5</id> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.util.logging.config.class</name> - <value>org.exoplatform.component.test.logging.LogConfigurator</value> - </property> - <property> - <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>gatein.test.datasource.driver</name> - <value>com.mysql.jdbc.Driver</value> - </property> - <property> - <name>gatein.test.datasource.url</name> - <value>jdbc:mysql://10.37.129.4/gatein?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf-8</value> - </property> - <property> - <name>gatein.test.datasource.username</name> - <value>root</value> - </property> - <property> - <name>gatein.test.datasource.password</name> - <value>a</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -  - <repositories> - <repository> - <id>mead</id> - <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - <repository> - <id>oauth</id> - <url>http://oauth.googlecode.com/svn/code/maven</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>java.net</id> - <url>http://download.java.net/maven/2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>exo-int</id> - <url>http://repository.exoplatform.org/content/groups/public</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - - - <pluginRepositories> - <pluginRepository> - <id>jboss-public-repository-group</id> - <name>JBoss Public Maven Repository Group</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>java.net</id> - <url>http://download.java.net/maven/2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - - </pluginRepositories> -</project> Copied: epp/portal/tags/EPP_5.2.0-DEV01/pom.xml (from rev 6827, epp/portal/branches/EPP_5_2_Branch/pom.xml) =================================================================== --- epp/portal/tags/EPP_5.2.0-DEV01/pom.xml (rev 0) +++ epp/portal/tags/EPP_5.2.0-DEV01/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -0,0 +1,1156 @@ + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.gatein</groupId> + <artifactId>gatein-parent</artifactId> + <version>1.0.2-GA</version> + </parent> + + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.2.0-epp-DEV01</version> + <packaging>pom</packaging> + + <name>EPP GateIn - Portal - ${project.version}</name> + + <properties> + <org.exoplatform.kernel.version>2.3.0-CR2</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.4.0-CR2</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.2.0-CR2</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.14.0-CR2</org.exoplatform.jcr.version> + <org.jibx.version>1.2.1</org.jibx.version> + <org.shindig.version>1.0-r790473-Patch06</org.shindig.version> + <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> + <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> + <org.gatein.wci.version>2.1.0-Beta04</org.gatein.wci.version> + <org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version> + <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> + <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> + <org.gatein.mop.version>1.1.0-Beta02</org.gatein.mop.version> + <org.slf4j.version>1.5.6</org.slf4j.version> + <rhino.version>1.6R5</rhino.version> + <org.codehaus.groovy.version>1.7.6</org.codehaus.groovy.version> + <javax.servlet.version>2.5</javax.servlet.version> + <version.chromattic>1.1.0-beta5</version.chromattic> + <version.reflect>1.1.0-beta12</version.reflect> + <jcip.version>1.0</jcip.version> + +  +  +  + +  + <jdk.min.version>1.6</jdk.min.version> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2_Branch</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_2_Branch</url> + </scm> + + <modules> + <module>component</module> + <module>gadgets</module> + <module>webui</module> + <module>portlet</module> + <module>web</module> + <module>server</module> + <module>examples</module> + <module>starter</module> + <module>packaging</module> + <module>testsuite</module> + <module>distribution</module> + </modules> + + <dependencyManagement> + <dependencies> + +  + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <version>${org.exoplatform.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <version>${org.exoplatform.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <version>${org.exoplatform.jcr.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + +  + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <version>${org.gatein.common.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <version>${org.gatein.common.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat6</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat7</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-jetty</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <version>${org.gatein.wsrp.version}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.controller</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.security</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.server</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.api</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.resources</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <version>5.2.0-epp-DEV01</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.xml-parser</artifactId> + <version>5.1.0-epp-ER01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.framework</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portlet</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.dashboard</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-core</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.core</artifactId> + <version>5.2.0-epp-DEV01</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.jcr</artifactId> + <version>5.2.0-epp-DEV01</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.test.organization</artifactId> + <version>5.2.0-epp-DEV01</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein.portal.component.wsrp</artifactId> + <version>5.2.0-epp-DEV01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.jboss.plugin</artifactId> + <version>5.2.0-epp-DEV01</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.tomcat.plugin</artifactId> + <version>5.1.0-epp-ER01-SNAPSHOT</version> + </dependency> + +  + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${version.chromattic}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ext</artifactId> + <version>${version.chromattic}</version> + </dependency> + +  + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-core</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-hibernate</artifactId> + <version>${org.picketlink.idm}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-ldap</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-cache</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-tomcat</artifactId> + <version>5.1.0.GA</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${org.slf4j.version}</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.5.5</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xerces</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.4</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.7</version> + </dependency> + + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20070829</version> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${javax.servlet.version}</version> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>${rhino.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${org.codehaus.groovy.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0</version> + </dependency> + + <dependency> + <groupId>caja</groupId> + <artifactId>caja</artifactId> + <version>r3375</version> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>json_simple</artifactId> + <version>r1</version> + </dependency> + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + <version>20080621</version> + </dependency> + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>1.0-rc2</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.9</version> + </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>3.8</version> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.9</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>nu.validator.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.0.7</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> + + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-features</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-server</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-server</artifactId> + <version>${org.shindig.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.captcha</groupId> + <artifactId>simplecaptcha</artifactId> + <version>${nl.captcha.simplecaptcha.version}</version> + </dependency> +  + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>${jcip.version}</version> + </dependency> + + </dependencies> + + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>${org.slf4j.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsd</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.*</include> + </includes> + </testResource> + </testResources> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.4</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Xms512m -Xmx512m</argLine> + <systemProperties> + <property> + <name>org.apache.commons.logging.Log</name> + <value>org.apache.commons.logging.impl.SimpleLog</value> + </property> + <property> + <name>org.apache.commons.logging.simplelog.defaultlog</name> + <value>info</value> + </property> + <property> + <name>org.apache.commons.logging.simplelog.log.[eXo]</name> + <value>debug</value> + </property> + <property> + <name>org.apache.commons.logging.simplelog.log.net.hibernate</name> + <value>warn</value> + </property> + <property> + <name>java.naming.factory.initial</name> + <value>org.exoplatform.services.naming.SimpleContextFactory</value> + </property> + </systemProperties> + </configuration> + </plugin> +  +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <fork>true</fork> + <meminitial>256m</meminitial> + <maxmem>1024m</maxmem> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>compile</id> + <phase>compile</phase> + <configuration> + <tasks> + <copy failonerror="false" todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> + <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes"> + <include name="**/*_en.properties" /> + </fileset> + <globmapper from="*_en.properties" to="*.properties" /> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.util.logging.config.class</name> + <value>org.exoplatform.component.test.logging.LogConfigurator</value> + </property> + <property> + <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>gatein.test.datasource.driver</name> + <value>org.hsqldb.jdbcDriver</value> + </property> + <property> + <name>gatein.test.datasource.url</name> + <value>jdbc:hsqldb:mem:gateindb</value> + </property> + <property> + <name>gatein.test.datasource.username</name> + <value>sa</value> + </property> + <property> + <name>gatein.test.datasource.password</name> + <value /> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>mysql5</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.6</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.util.logging.config.class</name> + <value>org.exoplatform.component.test.logging.LogConfigurator</value> + </property> + <property> + <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>gatein.test.datasource.driver</name> + <value>com.mysql.jdbc.Driver</value> + </property> + <property> + <name>gatein.test.datasource.url</name> + <value>jdbc:mysql://10.37.129.4/gatein?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf-8</value> + </property> + <property> + <name>gatein.test.datasource.username</name> + <value>root</value> + </property> + <property> + <name>gatein.test.datasource.password</name> + <value>a</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +  + <repositories> + <repository> + <id>mead</id> + <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + <repository> + <id>oauth</id> + <url>http://oauth.googlecode.com/svn/code/maven</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>exo-int</id> + <url>http://repository.exoplatform.org/content/groups/public</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + + <pluginRepositories> + <pluginRepository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>java.net</id> + <url>http://download.java.net/maven/2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + + </pluginRepositories> +</project> Modified: epp/portal/tags/EPP_5.2.0-DEV01/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/portlet/dashboard/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/portlet/exoadmin/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/portlet/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl 2011-07-05 07:17:38 UTC (rev 6833) @@ -1,36 +0,0 @@ -<% - import javax.portlet.PortletMode ; - import org.exoplatform.portal.application.PortalRequestContext; - import org.exoplatform.portal.webui.util.Util; - import org.gatein.common.text.EntityEncoder; - - def prContext = _ctx.getRequestContext().getParentAppRequestContext(); - String signInAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ShowLoginForm', true));" ; - String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeLanguage', true));" ; - String portletId = uicomponent.getId() ; - String accountSetting = "javascript:if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));" - String registerURI = Util.getPortalRequestContext().getPortalURI() + "register"; - String navTitle = uicomponent.getNavigationTitle(); - EntityEncoder encoder = EntityEncoder.FULL; - navTitle = encoder.encode(navTitle); -%> - -<div class="UILogoPortlet ClearFix" id="$uicomponent.id" > - <%if( _ctx.getRequestContext().getApplicationMode() == PortletMode.VIEW) {%> -  - <a href="#" class="Img"><image src="<%=uicomponent.getURL()%>" alt="" /></a> - <div class="BannerTitle">$navTitle</div> -  - <% if(prContext.getRemoteUser() == null) { %> - <div class="Signin ClearFix"> - <a onclick="$changeLanguageAction"><%=_ctx.appRes("UILogoPortlet.action.changeLanguage")%></a> - <a href="$registerURI"><%=_ctx.appRes("UILogoPortlet.action.Register")%></a> - <a onclick="$signInAction"><%=_ctx.appRes("UILogoPortlet.action.signin")%></a> - </div> - <% } %> - - <%} else { - uicomponent.renderChildren(); - } - %> -</div> Copied: epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl (from rev 6809, epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl) =================================================================== --- epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl (rev 0) +++ epp/portal/tags/EPP_5.2.0-DEV01/portlet/web/src/main/webapp/groovy/portal/webui/component/UILogoPortlet.gtmpl 2011-07-05 07:17:38 UTC (rev 6833) @@ -0,0 +1,44 @@ +<% + import javax.portlet.PortletMode ; + import org.exoplatform.portal.application.PortalRequestContext; + import org.exoplatform.portal.webui.util.Util; + import org.gatein.common.text.EntityEncoder; + + def prContext = _ctx.getRequestContext().getParentAppRequestContext(); + String signInAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ShowLoginForm', true));" ; + String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeLanguage', true));" ; + String portletId = uicomponent.getId() ; + String accountSetting = "javascript:if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'AccountSettings', true));" + String registerURI = Util.getPortalRequestContext().getPortalURI() + "register"; + String navTitle = uicomponent.getNavigationTitle(); + EntityEncoder encoder = EntityEncoder.FULL; + navTitle = encoder.encode(navTitle); +%> + +<div class="UILogoPortlet ClearFix" id="$uicomponent.id" > + <%if( _ctx.getRequestContext().getApplicationMode() == PortletMode.VIEW) {%> +  + <a href="#" class="Img"> + <% + String imgURL = uicomponent.getURL(); + if (imgURL != "") + { + print """<img src="$imgURL" />"""; + } + %> + </a> + <div class="BannerTitle">$navTitle</div> +  + <% if(prContext.getRemoteUser() == null) { %> + <div class="Signin ClearFix"> + <a onclick="$changeLanguageAction"><%=_ctx.appRes("UILogoPortlet.action.changeLanguage")%></a> + <a href="$registerURI"><%=_ctx.appRes("UILogoPortlet.action.Register")%></a> + <a onclick="$signInAction"><%=_ctx.appRes("UILogoPortlet.action.signin")%></a> + </div> + <% } %> + + <%} else { + uicomponent.renderChildren(); + } + %> +</div> Modified: epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/patch-ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/plugin/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/server/jboss/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/server/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/starter/ear/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</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.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5.2.0-DEV01/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/starter/jar/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5.2.0-DEV01/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/starter/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/starter/war/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</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.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </dependency> </dependencies> </project> Modified: epp/portal/tags/EPP_5.2.0-DEV01/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/testsuite/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/testsuite/selenium-snifftests/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/testsuite/webuibasedsamples/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js 2011-07-05 07:17:38 UTC (rev 6833) @@ -1,166 +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. - */ - -/** - * Manages a form component - */ -function UIForm() { -}; -/** - * Get form element with pattern condition - * @param {String} pattern - * The pattern can be Id#Id, example: Account#UIAccountForm - */ -UIForm.prototype.getFormElemt = function(pattern) { - if(pattern.indexOf("#") == -1) return document.getElementById(pattern) ; - var strArr = pattern.split("#") ; - var portlet = document.getElementById(strArr[0]) ; - return eXo.core.DOMUtil.findDescendantById(portlet, strArr[1]) ; -} - -/** - * A function that submits the form identified by formId, with the specified action - * If useAjax is true, calls the ajaxPost function from PortalHttpRequest, with the given callback function - * Note: ie bug you cannot have more than one button tag - */ -UIForm.prototype.submitForm = function(formId, action, useAjax, callback) { - if (!callback) callback = null; - var form = this.getFormElemt(formId) ; - //TODO need review try-cactch block for form doesn't use FCK - try { - if (FCKeditorAPI && typeof FCKeditorAPI == "object") { - for ( var name in FCKeditorAPI.__Instances ) { - var oEditor ; - try { - oEditor = FCKeditorAPI.__Instances[name] ; - if (oEditor && oEditor.GetParentForm && oEditor.GetParentForm() == form ) { - oEditor.UpdateLinkedField() ; - } - } catch(e) { - continue ; - } - } - } - } catch(e) {} - - form.elements['formOp'].value = action ; - if(useAjax) ajaxPost(form, callback) ; - else form.submit(); -} ; - -/** - * Submits a form by Ajax, with the given action and the given parameters - * Calls ajaxPost of PortalHttpRequest - * Note: ie bug you cannot have more than one button tag - */ -UIForm.prototype.submitEvent = function(formId, action, params) { - var form = this.getFormElemt(formId) ; - try { - if (FCKeditorAPI && typeof FCKeditorAPI == "object") { - for ( var name in FCKeditorAPI.__Instances ) { - var oEditor = FCKeditorAPI.__Instances[name] ; - if ( oEditor.GetParentForm && oEditor.GetParentForm() == form ) { - oEditor.UpdateLinkedField() ; - } - } - } - } catch(e) {} - form.elements['formOp'].value = action ; - if(!form.originalAction) form.originalAction = form.action ; - form.action = form.originalAction + encodeURI(params) ; - ajaxPost(form) ; -} ; - -UIForm.prototype.selectBoxOnChange = function(formId, elemt) { - var selectBox = eXo.core.DOMUtil.findAncestorByClass(elemt, "UISelectBoxOnChange"); - var contentContainer = eXo.core.DOMUtil.findFirstDescendantByClass(selectBox, "div", "SelectBoxContentContainer") ; - var tabs = eXo.core.DOMUtil.findChildrenByClass(contentContainer, "div", "SelectBoxContent"); - for(var i=0; i < tabs.length; i++) { - tabs[i].style.display = "none"; - } - tabs[elemt.selectedIndex].style.display = "block"; -} ; -/** - * Sets the value (hiddenValue) of a hidden field (typeId) in the form (formId) - */ -UIForm.prototype.setHiddenValue = function(formId, typeId, hiddenValue) { - var form = document.getElementById(formId) ; - if(form == null){ - maskWorkspace = document.getElementById("UIMaskWorkspace"); - form = eXo.core.DOMUtil.findDescendantById(maskWorkspace, formId); - } - form.elements[typeId].value = hiddenValue; -} ; -/** - * Returns a string that contains all the values of the elements of a form (formElement) in this format - * . fieldName=value - * The result is a string like this : abc=def&ghi=jkl... - * The values are encoded to be used in an URL - * Only serializes the elements of type : - * . text, hidden, password, textarea - * . checkbox and radio if they are checked - * . select-one if one option is selected - */ -/* -* This method goes through the form element passed as an argument and -* generates a string output in a GET request way. -* It also encodes the the form parameter values -*/ -UIForm.prototype.serializeForm = function (formElement) { - var queryString = ""; - var element ; - var elements = formElement.elements; - - this.addField = function(name, value) { - if (queryString.length > 0) queryString += "&"; - queryString += name + "=" + encodeURIComponent(value); - }; - - for(var i = 0; i < elements.length; i++) { - element = elements[i]; - //if(element.disabled) continue; - switch(element.type) { - case "text": - case "hidden": - case "password": - case "textarea" : - this.addField(element.name, element.value.replace(/\r/gi, "")); - break; - - case "checkbox": - case "radio": - if(element.checked) this.addField(element.name, element.value); - break; - - case "select-one": - if(element.selectedIndex > -1){ - this.addField(element.name, element.options[element.selectedIndex].value); - } - break; - case "select-multiple": - for(var j = 0; j < element.options.length; j++) { - if(element.options[j].selected) this.addField(element.name, element.options[j].value); - } - break; - } // switch - } // for - return queryString; -}; - -eXo.webui.UIForm = new UIForm(); \ No newline at end of file Copied: epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js (from rev 6813, epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js) =================================================================== --- epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js (rev 0) +++ epp/portal/tags/EPP_5.2.0-DEV01/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIForm.js 2011-07-05 07:17:38 UTC (rev 6833) @@ -0,0 +1,171 @@ +/** + * 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. + */ + +/** + * Manages a form component + */ +function UIForm() { +}; +/** + * Get form element with pattern condition + * @param {String} pattern + * The pattern can be Id#Id, example: Account#UIAccountForm + */ +UIForm.prototype.getFormElemt = function(pattern) { + if(pattern.indexOf("#") == -1) return document.getElementById(pattern) ; + var strArr = pattern.split("#") ; + var portlet = document.getElementById(strArr[0]) ; + return eXo.core.DOMUtil.findDescendantById(portlet, strArr[1]) ; +} + +/** + * A function that submits the form identified by formId, with the specified action + * If useAjax is true, calls the ajaxPost function from PortalHttpRequest, with the given callback function + * Note: ie bug you cannot have more than one button tag + */ +UIForm.prototype.submitForm = function(formId, action, useAjax, callback) { + if (!callback) callback = null; + var form = this.getFormElemt(formId) ; + //TODO need review try-cactch block for form doesn't use FCK + try { + if (FCKeditorAPI && typeof FCKeditorAPI == "object") { + for ( var name in FCKeditorAPI.__Instances ) { + var oEditor ; + try { + oEditor = FCKeditorAPI.__Instances[name] ; + if (oEditor && oEditor.GetParentForm && oEditor.GetParentForm() == form ) { + oEditor.UpdateLinkedField() ; + } + } catch(e) { + continue ; + } + } + } + } catch(e) {} + + form.elements['formOp'].value = action ; + if(useAjax) ajaxPost(form, callback) ; + else form.submit(); +} ; + +/** + * Submits a form by Ajax, with the given action and the given parameters + * Calls ajaxPost of PortalHttpRequest + * Note: ie bug you cannot have more than one button tag + */ +UIForm.prototype.submitEvent = function(formId, action, params) { + var form = this.getFormElemt(formId) ; + try { + if (FCKeditorAPI && typeof FCKeditorAPI == "object") { + for ( var name in FCKeditorAPI.__Instances ) { + var oEditor = FCKeditorAPI.__Instances[name] ; + if ( oEditor.GetParentForm && oEditor.GetParentForm() == form ) { + oEditor.UpdateLinkedField() ; + } + } + } + } catch(e) {} + form.elements['formOp'].value = action ; + if(!form.originalAction) form.originalAction = form.action ; + form.action = form.originalAction + encodeURI(params) ; + ajaxPost(form) ; +} ; + +UIForm.prototype.selectBoxOnChange = function(formId, elemt) { + var selectBox = eXo.core.DOMUtil.findAncestorByClass(elemt, "UISelectBoxOnChange"); + var contentContainer = eXo.core.DOMUtil.findFirstDescendantByClass(selectBox, "div", "SelectBoxContentContainer") ; + var tabs = eXo.core.DOMUtil.findChildrenByClass(contentContainer, "div", "SelectBoxContent"); + for(var i=0; i < tabs.length; i++) { + tabs[i].style.display = "none"; + } + tabs[elemt.selectedIndex].style.display = "block"; +} ; +/** + * Sets the value (hiddenValue) of a hidden field (typeId) in the form (formId) + */ +UIForm.prototype.setHiddenValue = function(formId, typeId, hiddenValue) { + var form = document.getElementById(formId) ; + if(form == null){ + maskWorkspace = document.getElementById("UIMaskWorkspace"); + form = eXo.core.DOMUtil.findDescendantById(maskWorkspace, formId); + } + form.elements[typeId].value = hiddenValue; +} ; +/** + * Returns a string that contains all the values of the elements of a form (formElement) in this format + * . fieldName=value + * The result is a string like this : abc=def&ghi=jkl... + * The values are encoded to be used in an URL + * Only serializes the elements of type : + * . text, hidden, password, textarea + * . checkbox and radio if they are checked + * . select-one if one option is selected + */ +/* +* This method goes through the form element passed as an argument and +* generates a string output in a GET request way. +* It also encodes the the form parameter values +*/ +UIForm.prototype.serializeForm = function (formElement) { + var queryString = ""; + var element ; + var elements = formElement.elements; + + this.addField = function(name, value) { + if (queryString.length > 0) queryString += "&"; + queryString += name + "=" + encodeURIComponent(value); + }; + + for(var i = 0; i < elements.length; i++) { + element = elements[i]; + //if(element.disabled) continue; + switch(element.type) { + case "text": + case "hidden": + case "password": + case "textarea" : + this.addField(element.name, element.value.replace(/\r/gi, "")); + break; + + case "checkbox": + if(element.checked) + this.addField(element.name, "true"); + else + this.addField(element.name, "false"); + break; + case "radio": + if(element.checked) this.addField(element.name, element.value); + break; + + case "select-one": + if(element.selectedIndex > -1){ + this.addField(element.name, element.options[element.selectedIndex].value); + } + break; + case "select-multiple": + for(var j = 0; j < element.options.length; j++) { + if(element.options[j].selected) this.addField(element.name, element.options[j].value); + } + break; + } // switch + } // for + return queryString; +}; + +eXo.webui.UIForm = new UIForm(); \ No newline at end of file Modified: epp/portal/tags/EPP_5.2.0-DEV01/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/web/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/web/portal/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/web/rest/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/core/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5.2.0-DEV01/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-07-05 07:17:38 UTC (rev 6833) @@ -1,155 +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.webui.form; - -import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.commons.serialization.api.annotations.Serialized; - -import java.io.Writer; - -/** - * Represents a checkbox field. - * @param <T> The type of value that is expected - */ -@SuppressWarnings("hiding") -@Serialized -public class UIFormCheckBoxInput<T> extends UIFormInputBase<T> -{ - /** - * Whether this checkbox is checked - */ - private boolean checked = false; - - /** - * A javascript expression that will be fired when the value changes (JS onChange event) - */ - private String onchange_; - - private String componentEvent_ = null; - - public UIFormCheckBoxInput() - { - } - - @SuppressWarnings("unchecked") - public UIFormCheckBoxInput(String name, String bindingExpression, T value) - { - super(name, bindingExpression, null); - if (value != null) - typeValue_ = (Class<T>)value.getClass(); - value_ = value; - setId(name); - } - - @SuppressWarnings("unchecked") - public UIFormInput setValue(T value) - { - if (value == null) - return super.setValue(value); - if (value instanceof Boolean) - { - checked = ((Boolean)value).booleanValue(); - } - else if (boolean.class.isInstance(value)) - { - checked = boolean.class.cast(value); - } - else if (value instanceof String) - { - checked = Boolean.parseBoolean((String)value); - } - typeValue_ = (Class<T>)value.getClass(); - return super.setValue(value); - } - - public void setOnChange(String onchange) - { - onchange_ = onchange; - } - - public void setComponentEvent(String com) - { - componentEvent_ = com; - } - - public void setOnChange(String event, String com) - { - this.onchange_ = event; - this.componentEvent_ = com; - } - - public String renderOnChangeEvent(UIForm uiForm) throws Exception - { - if (componentEvent_ == null) - return uiForm.event(onchange_, null); - return uiForm.event(onchange_, componentEvent_, (String)null); - } - - final public boolean isChecked() - { - return checked; - } - - final public UIFormCheckBoxInput setChecked(boolean check) - { - checked = check; - return this; - } - - @SuppressWarnings("unused") - public void decode(Object input, WebuiRequestContext context) throws Exception - { - if (!isEnable()) - return; - if (input == null) - checked = false; - else - checked = true; - if (typeValue_ == Boolean.class || typeValue_ == boolean.class) - { - value_ = typeValue_.cast(checked); - } - } - - public void processRender(WebuiRequestContext context) throws Exception - { - Writer w = context.getWriter(); - w.write("<input type='checkbox' name='"); - w.write(name); - w.write("'"); - w.write(" value='"); - if (value_ != null) - w.write(String.valueOf(value_)); - w.write("' "); - if (onchange_ != null) - { - UIForm uiForm = getAncestorOfType(UIForm.class); - w.append(" onclick=\"").append(renderOnChangeEvent(uiForm)).append("\""); - } - if (checked) - w.write(" checked "); - if (!enable_) - w.write(" disabled "); - w.write(" class='checkbox'/>"); - if (this.isMandatory()) - w.write(" *"); - } - -} \ No newline at end of file Copied: epp/portal/tags/EPP_5.2.0-DEV01/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java (from rev 6813, epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java) =================================================================== --- epp/portal/tags/EPP_5.2.0-DEV01/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java (rev 0) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-07-05 07:17:38 UTC (rev 6833) @@ -0,0 +1,158 @@ +/** + * 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.webui.form; + +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.commons.serialization.api.annotations.Serialized; + +import java.io.Writer; + +/** + * Represents a checkbox field. + * @param <T> The type of value that is expected + */ +@SuppressWarnings("hiding") +@Serialized +public class UIFormCheckBoxInput<T> extends UIFormInputBase<T> +{ + /** + * Whether this checkbox is checked + */ + private boolean checked = false; + + /** + * A javascript expression that will be fired when the value changes (JS onChange event) + */ + private String onchange_; + + private String componentEvent_ = null; + + public UIFormCheckBoxInput() + { + } + + @SuppressWarnings("unchecked") + public UIFormCheckBoxInput(String name, String bindingExpression, T value) + { + super(name, bindingExpression, null); + if (value != null) + typeValue_ = (Class<T>)value.getClass(); + value_ = value; + setId(name); + } + + @SuppressWarnings("unchecked") + public UIFormInput setValue(T value) + { + if (value == null) + return super.setValue(value); + if (value instanceof Boolean) + { + checked = ((Boolean)value).booleanValue(); + } + else if (boolean.class.isInstance(value)) + { + checked = boolean.class.cast(value); + } + else if (value instanceof String) + { + checked = Boolean.parseBoolean((String)value); + } + typeValue_ = (Class<T>)value.getClass(); + return super.setValue(value); + } + + public void setOnChange(String onchange) + { + onchange_ = onchange; + } + + public void setComponentEvent(String com) + { + componentEvent_ = com; + } + + public void setOnChange(String event, String com) + { + this.onchange_ = event; + this.componentEvent_ = com; + } + + public String renderOnChangeEvent(UIForm uiForm) throws Exception + { + if (componentEvent_ == null) + return uiForm.event(onchange_, null); + return uiForm.event(onchange_, componentEvent_, (String)null); + } + + final public boolean isChecked() + { + return checked; + } + + final public UIFormCheckBoxInput setChecked(boolean check) + { + checked = check; + return this; + } + + @SuppressWarnings("unused") + public void decode(Object input, WebuiRequestContext context) throws Exception + { + if (!isEnable()) + return; + + if (input != null) { + if(input.equals("true")) + checked = true; + else + checked = false; + if (typeValue_ == Boolean.class || typeValue_ == boolean.class) + { + value_ = typeValue_.cast(checked); + } + } + } + + public void processRender(WebuiRequestContext context) throws Exception + { + Writer w = context.getWriter(); + w.write("<input type='checkbox' name='"); + w.write(name); + w.write("'"); + w.write(" value='"); + if (value_ != null) + w.write(String.valueOf(value_)); + w.write("' "); + if (onchange_ != null) + { + UIForm uiForm = getAncestorOfType(UIForm.class); + w.append(" onclick=\"").append(renderOnChangeEvent(uiForm)).append("\""); + } + if (checked) + w.write(" checked "); + if (!enable_) + w.write(" disabled "); + w.write(" class='checkbox'/>"); + if (this.isMandatory()) + w.write(" *"); + } + +} \ No newline at end of file Modified: epp/portal/tags/EPP_5.2.0-DEV01/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/dashboard/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/eXo/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/framework/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/tags/EPP_5.2.0-DEV01/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/portal/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5.2.0-DEV01/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-07-04 13:55:57 UTC (rev 6808) +++ epp/portal/tags/EPP_5.2.0-DEV01/webui/portlet/pom.xml 2011-07-05 07:17:38 UTC (rev 6833) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV01-SNAPSHOT</version> + <version>5.2.0-epp-DEV01</version> </parent> <modelVersion>4.0.0</modelVersion>

13 years, 5 months

1
0
0 / 0

gatein SVN: r6832 - epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2011-07-05 02:54:31 -0400 (Tue, 05 Jul 2011) New Revision: 6832 Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Feedback.xml Log: Adding missing fallback files Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Feedback.xml =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Feedback.xml (rev 0) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/Feedback.xml 2011-07-05 06:54:31 UTC (rev 6832) @@ -0,0 +1,53 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent"> +%BOOK_ENTITIES; +]> +  + +<section id="jboss-feedback"> + <title>Give us Feedback</title> + + <para> + If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in JIRA against eXo Content. The following link will take you to bug report for eXo Content <ulink type="http" url="http://jira.exoplatform.org/secure/Dashboard.jspa">http://jira.exoplatform.org</ulink>. + </para> + <para> + Select the document name and version number relevant to the document you found the error in from the available lists then complete the description with as much detail as you can provide. + </para> + + + + <para> + Be sure to give us your name so that you can receive full credit for reporting the issue. + </para> + +</section>

13 years, 5 months

1
0
0 / 0

gatein SVN: r6831 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-07-05 02:52:18 -0400 (Tue, 05 Jul 2011) New Revision: 6831 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml Log: JBEPP-942 zip packaging by default Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-05 06:50:25 UTC (rev 6830) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-05 06:52:18 UTC (rev 6831) @@ -150,7 +150,7 @@ <profile> <id>epp-distribution-zip</id> <activation> - <activeByDefault>false</activeByDefault> + <activeByDefault>true</activeByDefault> </activation> <build> <plugins>

13 years, 5 months

1
0
0 / 0

gatein SVN: r6830 - in epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content: css and 1 other directories.

by do-not-reply＠jboss.org

Author: smumford Date: 2011-07-05 02:50:25 -0400 (Tue, 05 Jul 2011) New Revision: 6830 Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/css/ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/css/overrides.css epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/bkgrnd_greydots.png epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/bullet_arrowblue.png epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/documentation.png epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/jboss-logo.svg epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/redhat-logo.svg epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/rhlogo.png epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/shade.png Log: Adding missing fallback files Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/css/overrides.css =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/css/overrides.css (rev 0) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/css/overrides.css 2011-07-05 06:50:25 UTC (rev 6830) @@ -0,0 +1,56 @@ +a:link { + color:#0066cc; +} + +a:visited { + color:#6699cc; +} + +h1 { + color:#a70000; +} + +.producttitle { + background: #800 url(../images/h1-bg.png) top left repeat; +} + +.section h1.title { + color:#a70000; +} + + +h2,h3,h4,h5,h6 { + color:#a70000; +} + +table { + border:1px solid #aaa; +} + +table th { + background-color:#900; +} + +table tr.even td { + background-color:#f5f5f5; +} + +#title a { + height:54px; +} + +.term{ + color:#a70000; +} + +.revhistory table th { + color:#a70000; +} + +.edition { + color: #a70000; +} + +span.remark{ + background-color: #ffff00; +} Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/bkgrnd_greydots.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/bkgrnd_greydots.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/bullet_arrowblue.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/bullet_arrowblue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/documentation.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/documentation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/jboss-logo.svg =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/jboss-logo.svg (rev 0) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/jboss-logo.svg 2011-07-05 06:50:25 UTC (rev 6830) @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="139.51801" + height="79.202713" + id="svg2898" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="jboss-logo.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <metadata + id="metadata16"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="" /> + <dc:title /> + <dc:date /> + <dc:creator> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:creator> + <dc:rights> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:rights> + <dc:publisher> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:publisher> + <dc:identifier /> + <dc:source /> + <dc:relation /> + <dc:language /> + <dc:subject> + <rdf:Bag /> + </dc:subject> + <dc:coverage /> + <dc:description /> + <dc:contributor> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:contributor> + <cc:license + rdf:resource="" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="692" + inkscape:window-width="640" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="95.81665" + inkscape:cy="41.7868" + inkscape:window-x="846" + inkscape:window-y="127" + inkscape:current-layer="svg2898" /> + <defs + id="defs21"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="-50 : 600 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="700 : 600 : 1" + inkscape:persp3d-origin="300 : 400 : 1" + id="perspective18" /> + <inkscape:perspective + id="perspective2683" + inkscape:persp3d-origin="107.759 : 40.782333 : 1" + inkscape:vp_z="215.51801 : 61.1735 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 61.1735 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <g + id="g2622" + transform="scale(0.6473613,0.6473613)"> + <g + id="g2624"> + <path + id="path2626" + d="M 140.253,110.221 L 143.198,116.112 L 140.706,116.112 L 137.843,110.407 L 134.588,110.407 L 134.588,116.112 L 132.467,116.112 L 132.467,101.693 L 138.79,101.693 C 141.304,101.693 143.425,103.032 143.425,105.999 C 143.425,108.305 142.21,109.727 140.253,110.221 z M 138.79,103.732 L 134.588,103.732 L 134.588,108.367 L 138.79,108.367 C 140.232,108.367 141.241,107.626 141.241,106.06 C 141.241,104.556 140.253,103.732 138.79,103.732 z" + style="fill:#cc0000" /> + + <path + id="path2628" + d="M 155.164,111.458 L 148.016,111.458 C 148.243,113.538 149.417,114.424 150.736,114.424 C 151.642,114.424 152.363,114.095 153.084,113.559 L 154.341,114.918 C 153.394,115.824 152.261,116.339 150.612,116.339 C 148.079,116.339 145.936,114.3 145.936,110.716 C 145.936,107.049 147.873,105.071 150.673,105.071 C 153.742,105.071 155.226,107.563 155.226,110.489 C 155.226,110.879 155.185,111.231 155.164,111.458 z M 150.529,106.987 C 149.107,106.987 148.242,107.975 148.056,109.706 L 153.082,109.706 C 152.98,108.223 152.28,106.987 150.529,106.987 z" + style="fill:#cc0000" /> + + <path + id="path2630" + d="M 164.37,116.112 L 164.37,115.083 C 163.587,115.804 162.681,116.339 161.548,116.339 C 159.22,116.339 157.387,114.651 157.387,110.53 C 157.387,106.822 159.406,105.071 161.651,105.071 C 162.743,105.071 163.773,105.648 164.371,106.307 L 164.371,102.187 L 166.472,101.095 L 166.472,116.112 L 164.37,116.112 z M 164.391,108.45 C 163.917,107.811 162.928,107.028 161.857,107.028 C 160.333,107.028 159.509,108.182 159.509,110.468 C 159.509,113.187 160.374,114.381 161.94,114.381 C 162.949,114.381 163.835,113.701 164.391,113.002 L 164.391,108.45 z" + style="fill:#cc0000" /> + + <path + id="path2632" + d="M 184.266,116.112 L 184.266,109.644 L 177.632,109.644 L 177.632,116.112 L 175.47,116.112 L 175.47,101.693 L 177.632,101.693 L 177.632,107.522 L 184.266,107.522 L 184.266,101.693 L 186.428,101.693 L 186.428,116.112 L 184.266,116.112 z" + style="fill:#cc0000" /> + + <path + id="path2634" + d="M 196.065,116.112 L 196.065,115.042 C 195.324,115.783 194.273,116.339 193.099,116.339 C 191.348,116.339 189.35,115.351 189.35,112.693 C 189.35,110.283 191.204,109.191 193.655,109.191 C 194.665,109.191 195.468,109.335 196.065,109.603 L 196.065,108.799 C 196.065,107.625 195.344,106.966 194.026,106.966 C 192.914,106.966 192.048,107.172 191.204,107.646 L 190.38,106.04 C 191.41,105.401 192.564,105.071 194.088,105.071 C 196.498,105.071 198.147,106.245 198.147,108.697 L 198.147,116.112 L 196.065,116.112 L 196.065,116.112 z M 196.065,111.499 C 195.489,111.21 194.747,111.024 193.593,111.024 C 192.234,111.024 191.368,111.642 191.368,112.631 C 191.368,113.701 192.048,114.423 193.448,114.423 C 194.582,114.423 195.57,113.723 196.064,113.043 L 196.064,111.499 L 196.065,111.499 z" + style="fill:#cc0000" /> + + <path + id="path2636" + d="M 206.363,115.844 C 205.847,116.133 205.127,116.338 204.282,116.338 C 202.778,116.338 201.851,115.412 201.851,113.475 L 201.851,107.234 L 200.306,107.234 L 200.306,105.297 L 201.851,105.297 L 201.851,102.207 L 203.932,101.095 L 203.932,105.297 L 206.61,105.297 L 206.61,107.234 L 203.932,107.234 L 203.932,113.105 C 203.932,114.114 204.261,114.403 205.044,114.403 C 205.6,114.403 206.218,114.197 206.609,113.97 L 206.363,115.844 z" + style="fill:#cc0000" /> + + </g> + + <g + id="g2638"> + <path + id="path2640" + d="M 106.389,51.025 C 109.959,49.238 112.389,45.924 112.389,41.844 C 112.389,32.335 103.775,30.289 95.924,30.423 L 74.738,30.423 L 74.617,30.423 L 62.871,30.423 L 62.871,60.785 C 62.871,65.194 61.334,66.721 58.597,66.721 C 55.656,66.721 54.002,65.067 54.002,62.063 L 54.002,57.858 L 42.832,57.858 L 42.832,59.827 C 42.832,69.981 46.724,76.926 58.784,76.926 C 68.621,76.926 73.822,72.57 74.617,63.968 L 74.617,75.972 L 96.496,75.972 C 106.257,75.972 114.233,72.657 114.233,61.811 C 114.233,56.646 111.242,52.435 106.389,51.025 z M 86.487,39.605 L 95.668,39.605 C 98.161,39.605 100.52,40.697 100.52,44.01 C 100.52,47.263 97.714,48.348 95.668,48.348 L 86.487,48.348 L 86.487,39.605 z M 95.989,66.469 L 86.487,66.469 L 86.487,56 L 95.989,56 C 99.565,56 102.373,57.345 102.373,61.355 C 102.373,65.125 99.756,66.469 95.989,66.469 z" + style="fill:#cc0000" /> + + <path + id="path2642" + d="M 90.067,108.399 C 90.067,100.704 83.822,94.452 76.123,94.452 C 68.409,94.452 62.168,100.704 62.168,108.399 C 62.168,116.108 68.409,122.347 76.123,122.347 C 83.822,122.347 90.067,116.108 90.067,108.399 z" + style="fill:#cc0000" /> + + <path + id="path2644" + d="M 53.012,103.999 C 53.012,97.181 47.479,91.65 40.655,91.65 C 33.832,91.65 28.303,97.18 28.303,103.999 C 28.303,110.823 33.831,116.356 40.655,116.356 C 47.479,116.356 53.012,110.823 53.012,103.999 z" + style="fill:#cc0000" /> + + <path + id="path2646" + d="M 25.097,81.68 C 25.097,75.523 20.113,70.529 13.947,70.529 C 7.779,70.529 2.787,75.523 2.787,81.68 C 2.787,87.854 7.779,92.848 13.947,92.848 C 20.112,92.848 25.097,87.854 25.097,81.68 z" + style="fill:#cc0000" /> + + <path + id="path2648" + d="M 19.918,50.615 C 19.918,45.109 15.463,40.659 9.963,40.659 C 4.464,40.659 0,45.108 0,50.615 C 0,56.115 4.464,60.579 9.963,60.579 C 15.463,60.579 19.918,56.114 19.918,50.615 z" + style="fill:#cc0000" /> + + <path + id="path2650" + d="M 33.88,22.719 C 33.88,18.1 30.124,14.353 25.508,14.353 C 20.889,14.353 17.139,18.1 17.139,22.719 C 17.139,27.342 20.889,31.086 25.508,31.086 C 30.124,31.086 33.88,27.342 33.88,22.719 z" + style="fill:#cc0000" /> + + <path + id="path2652" + d="M 57.78,10.364 C 57.78,6.184 54.395,2.793 50.214,2.793 C 46.034,2.793 42.643,6.184 42.643,10.364 C 42.643,14.551 46.035,17.942 50.214,17.942 C 54.396,17.942 57.78,14.551 57.78,10.364 z" + style="fill:#cc0000" /> + + <path + id="path2654" + d="M 82.891,6.377 C 82.891,2.855 80.042,0 76.517,0 C 73.001,0 70.14,2.855 70.14,6.377 C 70.14,9.903 73.001,12.757 76.517,12.757 C 80.042,12.757 82.891,9.903 82.891,6.377 z" + style="fill:#cc0000" /> + + </g> + + <g + id="g2656"> + <g + id="g2658"> + <path + id="path2660" + d="M 161.415,62.895 C 156.077,61.543 149.709,61.118 147.172,56.742 C 147.293,57.624 147.376,58.522 147.376,59.448 C 147.376,61.433 147.077,63.315 146.536,65.067 L 155.794,65.067 C 155.794,66.721 156.504,67.933 157.582,68.762 C 158.604,69.532 160.076,69.904 161.604,69.904 C 163.701,69.904 166.706,69.02 166.706,66.4 C 166.706,63.855 163.321,63.336 161.415,62.895 z" + style="fill:none" /> + + <path + id="path2662" + d="M 129.896,50.193 C 124.851,50.193 123.318,55.244 123.318,59.448 C 123.318,63.665 124.851,68.635 129.896,68.635 C 134.935,68.635 136.529,63.665 136.529,59.448 C 136.528,55.244 134.935,50.193 129.896,50.193 z" + style="fill:none" /> + + <path + id="path2664" + d="M 192.015,62.895 C 185.337,61.204 176.724,60.97 176.338,52.616 L 166.718,52.616 C 166.718,51.22 166.206,50.326 165.322,49.75 C 164.419,49.181 163.215,48.923 161.875,48.923 C 160.094,48.923 156.883,49.111 156.883,51.41 C 156.883,54.542 164.156,55.115 169.13,56.197 C 175.779,57.532 177.529,62.315 177.553,65.066 L 186.395,65.066 C 186.395,66.72 187.105,67.932 188.183,68.761 C 189.206,69.531 190.677,69.903 192.204,69.903 C 194.301,69.903 197.307,69.019 197.307,66.399 C 197.306,63.855 193.922,63.336 192.015,62.895 z" + style="fill:none" /> + + <path + id="path2666" + d="M 199.729,56.198 C 194.754,55.116 187.148,54.544 187.148,51.411 C 187.148,49.111 190.027,48.924 191.808,48.924 C 193.147,48.924 194.352,49.182 195.255,49.751 C 196.139,50.327 196.651,51.221 196.651,52.617 L 206.67,52.617 C 206.285,44.011 198.69,41.903 191.431,41.903 C 185.383,41.903 177.526,43.785 176.439,50.443 C 174.954,43.662 168.095,41.903 161.496,41.903 C 154.986,41.903 146.035,44.075 146.035,52.049 C 146.035,52.19 146.056,52.31 146.059,52.447 C 143.534,46.151 137.569,41.903 129.896,41.903 C 121.597,41.903 115.392,46.75 113.294,53.899 C 114.898,56.057 115.742,58.872 115.742,61.811 C 115.742,64.224 115.358,66.36 114.631,68.23 C 117.484,73.503 122.974,76.926 129.896,76.926 C 137.25,76.926 143.019,73.054 145.711,67.207 C 147.125,74.716 154.473,76.926 161.668,76.926 C 167.855,76.926 174.688,74.899 176.847,69.154 C 179.082,75.103 185.737,76.926 192.268,76.926 C 199.73,76.926 208.154,73.995 208.154,65.125 C 208.153,62.383 206.423,57.542 199.729,56.198 z M 129.896,68.63! 5 C 124.851,68.635 123.318,63.665 123.318,59.448 C 123.318,55.243 124.851,50.193 129.896,50.193 C 134.935,50.193 136.529,55.244 136.529,59.448 C 136.528,63.666 134.935,68.635 129.896,68.635 z M 161.604,69.904 C 160.076,69.904 158.604,69.532 157.582,68.762 C 156.504,67.933 155.794,66.721 155.794,65.067 L 146.536,65.067 C 147.077,63.315 147.376,61.433 147.376,59.448 C 147.376,58.522 147.293,57.624 147.172,56.742 C 149.709,61.117 156.077,61.543 161.415,62.895 C 163.321,63.336 166.706,63.855 166.706,66.4 C 166.706,69.02 163.701,69.904 161.604,69.904 z M 192.203,69.904 C 190.676,69.904 189.205,69.532 188.182,68.762 C 187.104,67.933 186.394,66.721 186.394,65.067 L 177.552,65.067 C 177.529,62.316 175.779,57.533 169.129,56.198 C 164.155,55.116 156.882,54.544 156.882,51.411 C 156.882,49.111 160.093,48.924 161.874,48.924 C 163.214,48.924 164.418,49.182 165.321,49.751 C 166.206,50.327 166.717,51.221 166.717,52.617 L 176.337,52.617 C 176.723,60.971 185.336,61.204 192.014,62.896 C 193.9! 21,63.337 197.305,63.856 197.305,66.401 C 197.306,69.02 194.3,! 69.904 1 92.203,69.904 z" + style="fill:#60605b" /> + + </g> + + <path + id="path2668" + d="M 209.127,36.16 L 210.092,36.16 L 211.544,38.546 L 212.485,38.546 L 210.914,36.116 C 211.721,36.014 212.334,35.586 212.334,34.607 C 212.334,33.508 211.696,33.034 210.396,33.034 L 208.294,33.034 L 208.294,38.546 L 209.127,38.546 L 209.127,36.16 z M 209.127,35.446 L 209.127,33.735 L 210.27,33.735 C 210.837,33.735 211.47,33.867 211.47,34.55 C 211.47,35.397 210.837,35.446 210.131,35.446 L 209.127,35.446 z" + style="fill:#60605b" /> + + <path + id="path2670" + d="M 215.518,35.8 C 215.518,38.78 213.098,41.192 210.119,41.192 C 207.133,41.192 204.713,38.78 204.713,35.8 C 204.713,32.813 207.133,30.395 210.119,30.395 C 213.098,30.396 215.518,32.813 215.518,35.8 z M 210.118,31.356 C 207.654,31.356 205.666,33.338 205.666,35.8 C 205.666,38.251 207.654,40.232 210.118,40.232 C 212.568,40.232 214.556,38.251 214.556,35.8 C 214.557,33.338 212.568,31.356 210.118,31.356 z" + style="fill:#60605b" /> + + </g> + + <g + id="g2672"> + <path + id="path2674" + d="M 108.227,116.338 C 107.135,116.338 106.105,115.762 105.508,115.103 L 105.508,116.112 L 103.406,116.112 L 103.406,102.187 L 105.508,101.095 L 105.508,106.327 C 106.29,105.605 107.196,105.07 108.33,105.07 C 110.657,105.07 112.49,106.759 112.49,110.879 C 112.49,114.588 110.472,116.338 108.227,116.338 z M 107.938,107.028 C 106.928,107.028 106.042,107.708 105.487,108.409 L 105.487,112.961 C 105.961,113.6 106.949,114.382 108.02,114.382 C 109.544,114.382 110.369,113.23 110.369,110.943 C 110.369,108.223 109.504,107.028 107.938,107.028 z" + style="fill:#60605b" /> + + <path + id="path2676" + d="M 118.915,119.923 L 116.67,119.923 L 118.235,115.906 L 114.259,105.297 L 116.587,105.297 L 118.358,110.592 C 118.687,111.539 119.182,113.146 119.305,113.742 C 119.491,113.104 119.944,111.559 120.273,110.633 L 122.107,105.297 L 124.352,105.297 L 118.915,119.923 z" + style="fill:#60605b" /> + + </g> + +</g> +</svg> Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/redhat-logo.svg =================================================================== --- epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/redhat-logo.svg (rev 0) +++ epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/redhat-logo.svg 2011-07-05 06:50:25 UTC (rev 6830) @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="139.51801" + height="79.202713" + id="svg2898" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="redhat-logo.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <metadata + id="metadata16"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="" /> + <dc:title /> + <dc:date /> + <dc:creator> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:creator> + <dc:rights> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:rights> + <dc:publisher> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:publisher> + <dc:identifier /> + <dc:source /> + <dc:relation /> + <dc:language /> + <dc:subject> + <rdf:Bag /> + </dc:subject> + <dc:coverage /> + <dc:description /> + <dc:contributor> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:contributor> + <cc:license + rdf:resource="" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="692" + inkscape:window-width="640" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="95.81665" + inkscape:cy="121.7868" + inkscape:window-x="1091" + inkscape:window-y="85" + inkscape:current-layer="svg2898" /> + <defs + id="defs21"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="-50 : 600 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="700 : 600 : 1" + inkscape:persp3d-origin="300 : 400 : 1" + id="perspective18" /> + <inkscape:perspective + id="perspective2683" + inkscape:persp3d-origin="107.759 : 40.782333 : 1" + inkscape:vp_z="215.51801 : 61.1735 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 61.1735 : 1" + sodipodi:type="inkscape:persp3d" /> + <inkscape:perspective + id="perspective2733" + inkscape:persp3d-origin="150 : 46.666667 : 1" + inkscape:vp_z="300 : 70 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 70 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <g + id="g2622" + transform="scale(0.6473613,0.6473613)" + inkscape:export-filename="/home/rlerch/Source/SVN/publican/trunk/publican-jboss/en-US/images/image_left.png" + inkscape:export-xdpi="61.361534" + inkscape:export-ydpi="61.361534"> + <g + id="g2624"> + <path + id="path2626" + d="M 140.253,110.221 L 143.198,116.112 L 140.706,116.112 L 137.843,110.407 L 134.588,110.407 L 134.588,116.112 L 132.467,116.112 L 132.467,101.693 L 138.79,101.693 C 141.304,101.693 143.425,103.032 143.425,105.999 C 143.425,108.305 142.21,109.727 140.253,110.221 z M 138.79,103.732 L 134.588,103.732 L 134.588,108.367 L 138.79,108.367 C 140.232,108.367 141.241,107.626 141.241,106.06 C 141.241,104.556 140.253,103.732 138.79,103.732 z" + style="fill:#cc0000" /> + + <path + id="path2628" + d="M 155.164,111.458 L 148.016,111.458 C 148.243,113.538 149.417,114.424 150.736,114.424 C 151.642,114.424 152.363,114.095 153.084,113.559 L 154.341,114.918 C 153.394,115.824 152.261,116.339 150.612,116.339 C 148.079,116.339 145.936,114.3 145.936,110.716 C 145.936,107.049 147.873,105.071 150.673,105.071 C 153.742,105.071 155.226,107.563 155.226,110.489 C 155.226,110.879 155.185,111.231 155.164,111.458 z M 150.529,106.987 C 149.107,106.987 148.242,107.975 148.056,109.706 L 153.082,109.706 C 152.98,108.223 152.28,106.987 150.529,106.987 z" + style="fill:#cc0000" /> + + <path + id="path2630" + d="M 164.37,116.112 L 164.37,115.083 C 163.587,115.804 162.681,116.339 161.548,116.339 C 159.22,116.339 157.387,114.651 157.387,110.53 C 157.387,106.822 159.406,105.071 161.651,105.071 C 162.743,105.071 163.773,105.648 164.371,106.307 L 164.371,102.187 L 166.472,101.095 L 166.472,116.112 L 164.37,116.112 z M 164.391,108.45 C 163.917,107.811 162.928,107.028 161.857,107.028 C 160.333,107.028 159.509,108.182 159.509,110.468 C 159.509,113.187 160.374,114.381 161.94,114.381 C 162.949,114.381 163.835,113.701 164.391,113.002 L 164.391,108.45 z" + style="fill:#cc0000" /> + + <path + id="path2632" + d="M 184.266,116.112 L 184.266,109.644 L 177.632,109.644 L 177.632,116.112 L 175.47,116.112 L 175.47,101.693 L 177.632,101.693 L 177.632,107.522 L 184.266,107.522 L 184.266,101.693 L 186.428,101.693 L 186.428,116.112 L 184.266,116.112 z" + style="fill:#cc0000" /> + + <path + id="path2634" + d="M 196.065,116.112 L 196.065,115.042 C 195.324,115.783 194.273,116.339 193.099,116.339 C 191.348,116.339 189.35,115.351 189.35,112.693 C 189.35,110.283 191.204,109.191 193.655,109.191 C 194.665,109.191 195.468,109.335 196.065,109.603 L 196.065,108.799 C 196.065,107.625 195.344,106.966 194.026,106.966 C 192.914,106.966 192.048,107.172 191.204,107.646 L 190.38,106.04 C 191.41,105.401 192.564,105.071 194.088,105.071 C 196.498,105.071 198.147,106.245 198.147,108.697 L 198.147,116.112 L 196.065,116.112 L 196.065,116.112 z M 196.065,111.499 C 195.489,111.21 194.747,111.024 193.593,111.024 C 192.234,111.024 191.368,111.642 191.368,112.631 C 191.368,113.701 192.048,114.423 193.448,114.423 C 194.582,114.423 195.57,113.723 196.064,113.043 L 196.064,111.499 L 196.065,111.499 z" + style="fill:#cc0000" /> + + <path + id="path2636" + d="M 206.363,115.844 C 205.847,116.133 205.127,116.338 204.282,116.338 C 202.778,116.338 201.851,115.412 201.851,113.475 L 201.851,107.234 L 200.306,107.234 L 200.306,105.297 L 201.851,105.297 L 201.851,102.207 L 203.932,101.095 L 203.932,105.297 L 206.61,105.297 L 206.61,107.234 L 203.932,107.234 L 203.932,113.105 C 203.932,114.114 204.261,114.403 205.044,114.403 C 205.6,114.403 206.218,114.197 206.609,113.97 L 206.363,115.844 z" + style="fill:#cc0000" /> + + </g> + + <g + id="g2638"> + <path + id="path2640" + d="M 106.389,51.025 C 109.959,49.238 112.389,45.924 112.389,41.844 C 112.389,32.335 103.775,30.289 95.924,30.423 L 74.738,30.423 L 74.617,30.423 L 62.871,30.423 L 62.871,60.785 C 62.871,65.194 61.334,66.721 58.597,66.721 C 55.656,66.721 54.002,65.067 54.002,62.063 L 54.002,57.858 L 42.832,57.858 L 42.832,59.827 C 42.832,69.981 46.724,76.926 58.784,76.926 C 68.621,76.926 73.822,72.57 74.617,63.968 L 74.617,75.972 L 96.496,75.972 C 106.257,75.972 114.233,72.657 114.233,61.811 C 114.233,56.646 111.242,52.435 106.389,51.025 z M 86.487,39.605 L 95.668,39.605 C 98.161,39.605 100.52,40.697 100.52,44.01 C 100.52,47.263 97.714,48.348 95.668,48.348 L 86.487,48.348 L 86.487,39.605 z M 95.989,66.469 L 86.487,66.469 L 86.487,56 L 95.989,56 C 99.565,56 102.373,57.345 102.373,61.355 C 102.373,65.125 99.756,66.469 95.989,66.469 z" + style="fill:#cc0000" /> + + <path + id="path2642" + d="M 90.067,108.399 C 90.067,100.704 83.822,94.452 76.123,94.452 C 68.409,94.452 62.168,100.704 62.168,108.399 C 62.168,116.108 68.409,122.347 76.123,122.347 C 83.822,122.347 90.067,116.108 90.067,108.399 z" + style="fill:#cc0000" /> + + <path + id="path2644" + d="M 53.012,103.999 C 53.012,97.181 47.479,91.65 40.655,91.65 C 33.832,91.65 28.303,97.18 28.303,103.999 C 28.303,110.823 33.831,116.356 40.655,116.356 C 47.479,116.356 53.012,110.823 53.012,103.999 z" + style="fill:#cc0000" /> + + <path + id="path2646" + d="M 25.097,81.68 C 25.097,75.523 20.113,70.529 13.947,70.529 C 7.779,70.529 2.787,75.523 2.787,81.68 C 2.787,87.854 7.779,92.848 13.947,92.848 C 20.112,92.848 25.097,87.854 25.097,81.68 z" + style="fill:#cc0000" /> + + <path + id="path2648" + d="M 19.918,50.615 C 19.918,45.109 15.463,40.659 9.963,40.659 C 4.464,40.659 0,45.108 0,50.615 C 0,56.115 4.464,60.579 9.963,60.579 C 15.463,60.579 19.918,56.114 19.918,50.615 z" + style="fill:#cc0000" /> + + <path + id="path2650" + d="M 33.88,22.719 C 33.88,18.1 30.124,14.353 25.508,14.353 C 20.889,14.353 17.139,18.1 17.139,22.719 C 17.139,27.342 20.889,31.086 25.508,31.086 C 30.124,31.086 33.88,27.342 33.88,22.719 z" + style="fill:#cc0000" /> + + <path + id="path2652" + d="M 57.78,10.364 C 57.78,6.184 54.395,2.793 50.214,2.793 C 46.034,2.793 42.643,6.184 42.643,10.364 C 42.643,14.551 46.035,17.942 50.214,17.942 C 54.396,17.942 57.78,14.551 57.78,10.364 z" + style="fill:#cc0000" /> + + <path + id="path2654" + d="M 82.891,6.377 C 82.891,2.855 80.042,0 76.517,0 C 73.001,0 70.14,2.855 70.14,6.377 C 70.14,9.903 73.001,12.757 76.517,12.757 C 80.042,12.757 82.891,9.903 82.891,6.377 z" + style="fill:#cc0000" /> + + </g> + + <g + id="g2656"> + <g + id="g2658"> + <path + id="path2660" + d="M 161.415,62.895 C 156.077,61.543 149.709,61.118 147.172,56.742 C 147.293,57.624 147.376,58.522 147.376,59.448 C 147.376,61.433 147.077,63.315 146.536,65.067 L 155.794,65.067 C 155.794,66.721 156.504,67.933 157.582,68.762 C 158.604,69.532 160.076,69.904 161.604,69.904 C 163.701,69.904 166.706,69.02 166.706,66.4 C 166.706,63.855 163.321,63.336 161.415,62.895 z" + style="fill:none" /> + + <path + id="path2662" + d="M 129.896,50.193 C 124.851,50.193 123.318,55.244 123.318,59.448 C 123.318,63.665 124.851,68.635 129.896,68.635 C 134.935,68.635 136.529,63.665 136.529,59.448 C 136.528,55.244 134.935,50.193 129.896,50.193 z" + style="fill:none" /> + + <path + id="path2664" + d="M 192.015,62.895 C 185.337,61.204 176.724,60.97 176.338,52.616 L 166.718,52.616 C 166.718,51.22 166.206,50.326 165.322,49.75 C 164.419,49.181 163.215,48.923 161.875,48.923 C 160.094,48.923 156.883,49.111 156.883,51.41 C 156.883,54.542 164.156,55.115 169.13,56.197 C 175.779,57.532 177.529,62.315 177.553,65.066 L 186.395,65.066 C 186.395,66.72 187.105,67.932 188.183,68.761 C 189.206,69.531 190.677,69.903 192.204,69.903 C 194.301,69.903 197.307,69.019 197.307,66.399 C 197.306,63.855 193.922,63.336 192.015,62.895 z" + style="fill:none" /> + + <path + id="path2666" + d="M 199.729,56.198 C 194.754,55.116 187.148,54.544 187.148,51.411 C 187.148,49.111 190.027,48.924 191.808,48.924 C 193.147,48.924 194.352,49.182 195.255,49.751 C 196.139,50.327 196.651,51.221 196.651,52.617 L 206.67,52.617 C 206.285,44.011 198.69,41.903 191.431,41.903 C 185.383,41.903 177.526,43.785 176.439,50.443 C 174.954,43.662 168.095,41.903 161.496,41.903 C 154.986,41.903 146.035,44.075 146.035,52.049 C 146.035,52.19 146.056,52.31 146.059,52.447 C 143.534,46.151 137.569,41.903 129.896,41.903 C 121.597,41.903 115.392,46.75 113.294,53.899 C 114.898,56.057 115.742,58.872 115.742,61.811 C 115.742,64.224 115.358,66.36 114.631,68.23 C 117.484,73.503 122.974,76.926 129.896,76.926 C 137.25,76.926 143.019,73.054 145.711,67.207 C 147.125,74.716 154.473,76.926 161.668,76.926 C 167.855,76.926 174.688,74.899 176.847,69.154 C 179.082,75.103 185.737,76.926 192.268,76.926 C 199.73,76.926 208.154,73.995 208.154,65.125 C 208.153,62.383 206.423,57.542 199.729,56.198 z M 129.896,68.63! 5 C 124.851,68.635 123.318,63.665 123.318,59.448 C 123.318,55.243 124.851,50.193 129.896,50.193 C 134.935,50.193 136.529,55.244 136.529,59.448 C 136.528,63.666 134.935,68.635 129.896,68.635 z M 161.604,69.904 C 160.076,69.904 158.604,69.532 157.582,68.762 C 156.504,67.933 155.794,66.721 155.794,65.067 L 146.536,65.067 C 147.077,63.315 147.376,61.433 147.376,59.448 C 147.376,58.522 147.293,57.624 147.172,56.742 C 149.709,61.117 156.077,61.543 161.415,62.895 C 163.321,63.336 166.706,63.855 166.706,66.4 C 166.706,69.02 163.701,69.904 161.604,69.904 z M 192.203,69.904 C 190.676,69.904 189.205,69.532 188.182,68.762 C 187.104,67.933 186.394,66.721 186.394,65.067 L 177.552,65.067 C 177.529,62.316 175.779,57.533 169.129,56.198 C 164.155,55.116 156.882,54.544 156.882,51.411 C 156.882,49.111 160.093,48.924 161.874,48.924 C 163.214,48.924 164.418,49.182 165.321,49.751 C 166.206,50.327 166.717,51.221 166.717,52.617 L 176.337,52.617 C 176.723,60.971 185.336,61.204 192.014,62.896 C 193.9! 21,63.337 197.305,63.856 197.305,66.401 C 197.306,69.02 194.3,! 69.904 1 92.203,69.904 z" + style="fill:#60605b" /> + + </g> + + <path + id="path2668" + d="M 209.127,36.16 L 210.092,36.16 L 211.544,38.546 L 212.485,38.546 L 210.914,36.116 C 211.721,36.014 212.334,35.586 212.334,34.607 C 212.334,33.508 211.696,33.034 210.396,33.034 L 208.294,33.034 L 208.294,38.546 L 209.127,38.546 L 209.127,36.16 z M 209.127,35.446 L 209.127,33.735 L 210.27,33.735 C 210.837,33.735 211.47,33.867 211.47,34.55 C 211.47,35.397 210.837,35.446 210.131,35.446 L 209.127,35.446 z" + style="fill:#60605b" /> + + <path + id="path2670" + d="M 215.518,35.8 C 215.518,38.78 213.098,41.192 210.119,41.192 C 207.133,41.192 204.713,38.78 204.713,35.8 C 204.713,32.813 207.133,30.395 210.119,30.395 C 213.098,30.396 215.518,32.813 215.518,35.8 z M 210.118,31.356 C 207.654,31.356 205.666,33.338 205.666,35.8 C 205.666,38.251 207.654,40.232 210.118,40.232 C 212.568,40.232 214.556,38.251 214.556,35.8 C 214.557,33.338 212.568,31.356 210.118,31.356 z" + style="fill:#60605b" /> + + </g> + + <g + id="g2672"> + <path + id="path2674" + d="M 108.227,116.338 C 107.135,116.338 106.105,115.762 105.508,115.103 L 105.508,116.112 L 103.406,116.112 L 103.406,102.187 L 105.508,101.095 L 105.508,106.327 C 106.29,105.605 107.196,105.07 108.33,105.07 C 110.657,105.07 112.49,106.759 112.49,110.879 C 112.49,114.588 110.472,116.338 108.227,116.338 z M 107.938,107.028 C 106.928,107.028 106.042,107.708 105.487,108.409 L 105.487,112.961 C 105.961,113.6 106.949,114.382 108.02,114.382 C 109.544,114.382 110.369,113.23 110.369,110.943 C 110.369,108.223 109.504,107.028 107.938,107.028 z" + style="fill:#60605b" /> + + <path + id="path2676" + d="M 118.915,119.923 L 116.67,119.923 L 118.235,115.906 L 114.259,105.297 L 116.587,105.297 L 118.358,110.592 C 118.687,111.539 119.182,113.146 119.305,113.742 C 119.491,113.104 119.944,111.559 120.273,110.633 L 122.107,105.297 L 124.352,105.297 L 118.915,119.923 z" + style="fill:#60605b" /> + + </g> + +</g> +</svg> Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/rhlogo.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/rhlogo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/shade.png =================================================================== (Binary files differ) Property changes on: epp/docs/branches/5.1/Site_Publisher/User_Guide/en-US/fallback_content/images/shade.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits July 2011