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> - - <!-- EAP overlay --> - <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> - <!-- Put to gether all components --> - <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> - <!-- Apply patches and rename folders --> - <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> - <!-- Package to zip --> - <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> + + <!-- EAP overlay --> + <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> + <!-- Put to gether all components --> + <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> + <!-- Apply patches and rename folders --> + <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> + <!-- Package to zip --> + <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 @@ -<!-- - - 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 detail - - 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. - ---> - -<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> - - <!-- ************** --> - <!-- Build settings --> - <!-- ************** --> - - <!-- maven-enforcer-plugin --> - <jdk.min.version>1.6</jdk.min.version> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/br... - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/port... - <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_1... - </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> - - <!-- eXo JCR stack --> - <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> - - <!-- GateIn components --> - <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> - - <!-- GateIn --> - <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> - - <!-- Chromattic --> - <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> - - <!-- Picketlink --> - <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> - <!-- needed for the IBM jdk, should be remove in the future when IBM fixes its jdk (see GTNPORTAL-636) --> - <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> - <!-- we shouldn't need to specify this plugin here, but the maven compiler plugin is not accepting its - memory option properties. This should be removed when we can just set the compiler properties --> - <!-- we need to specify this as building GateIn can cause memory problems with some JDKs (ie IBM) --> - <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&amp;useUnicode=true&amp;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> - - <!-- To be removed and replaced by settings in user config --> - <repositories> - <repository> - <id>mead</id> - <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/... - <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 @@ +<!-- + + 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 detail + + 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. + +--> + +<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> + + <!-- ************** --> + <!-- Build settings --> + <!-- ************** --> + + <!-- maven-enforcer-plugin --> + <jdk.min.version>1.6</jdk.min.version> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/br... + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/port... + <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_2... + </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> + + <!-- eXo JCR stack --> + <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> + + <!-- GateIn components --> + <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> + + <!-- GateIn --> + <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> + + <!-- Chromattic --> + <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> + + <!-- Picketlink --> + <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> + <!-- needed for the IBM jdk, should be remove in the future when IBM fixes its jdk (see GTNPORTAL-636) --> + <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> + <!-- we shouldn't need to specify this plugin here, but the maven compiler plugin is not accepting its + memory option properties. This should be removed when we can just set the compiler properties --> + <!-- we need to specify this as building GateIn can cause memory problems with some JDKs (ie IBM) --> + <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&amp;useUnicode=true&amp;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> + + <!-- To be removed and replaced by settings in user config --> + <repositories> + <repository> + <id>mead</id> + <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/... + <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) {%> - <!-- LOGO IMAGE --> - <a href="#" class="Img"><image src="<%=uicomponent.getURL()%>" alt="" /></a> - <div class="BannerTitle">$navTitle</div> - <!-- ACTIONs --> - <% 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) {%> + <!-- LOGO IMAGE --> + <a href="#" class="Img"> + <% + String imgURL = uicomponent.getURL(); + if (imgURL != "") + { + print """<img src="$imgURL" />"""; + } + %> + </a> + <div class="BannerTitle">$navTitle</div> + <!-- ACTIONs --> + <% 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>