[gatein-commits] gatein SVN: r8765 - in epp/portal/tags: EPP_5_2_2_ER01 and 120 other directories.

Author: hfnukal Date: 2012-07-03 08:10:17 -0400 (Tue, 03 Jul 2012) New Revision: 8765 Added: epp/portal/tags/EPP_5_2_2_ER01/ epp/portal/tags/EPP_5_2_2_ER01/component/common/src/main/java/conf/configuration-jboss.properties epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/build.xml epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config_portal-system.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config_portal-system.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java Removed: epp/portal/tags/EPP_5_2_2_ER01/component/common/src/main/java/conf/configuration-jboss.properties epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/build.xml epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java Modified: epp/portal/tags/EPP_5_2_2_ER01/component/application-registry/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/common/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/identity/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/initializer/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/management/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/pc/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/portal/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/resources/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/scripting/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/test/core/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/test/jcr/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/test/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/web/api/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/web/controller/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/web/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/web/resources/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/web/security/pom.xml epp/portal/tags/EPP_5_2_2_ER01/component/web/server/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/examples/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/gatein-management/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/portletbridge/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/integration.war/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-core/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-doc/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-jcr/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-junit/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-kernel/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-parent/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-ws/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-common/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-dep/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-examples/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-jon-plugin/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-mop/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-parent/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-pc/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-portal/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-shindig/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-simplecaptcha/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-sso/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-wci/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-wsrp/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-eppsp/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-picketlink-idm/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-portletbridge/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/mead.parent/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/pom.xml epp/portal/tags/EPP_5_2_2_ER01/distribution/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/extension/config/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/extension/ear/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/extension/jar/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/extension/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/extension/war/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portal/config/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portal/ear/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portal/jar/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portal/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portal/rest-war/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portal/war/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/api/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/jsfhellouser/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/jsphellouser/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/simplesthelloworld/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/struts-jpetstore/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/skins/pom.xml epp/portal/tags/EPP_5_2_2_ER01/examples/skins/simpleskin/pom.xml epp/portal/tags/EPP_5_2_2_ER01/gadgets/core/pom.xml epp/portal/tags/EPP_5_2_2_ER01/gadgets/eXoGadgets/pom.xml epp/portal/tags/EPP_5_2_2_ER01/gadgets/gwtGadgets/pom.xml epp/portal/tags/EPP_5_2_2_ER01/gadgets/pom.xml epp/portal/tags/EPP_5_2_2_ER01/gadgets/server/pom.xml epp/portal/tags/EPP_5_2_2_ER01/pom.xml epp/portal/tags/EPP_5_2_2_ER01/portlet/dashboard/pom.xml epp/portal/tags/EPP_5_2_2_ER01/portlet/exoadmin/pom.xml epp/portal/tags/EPP_5_2_2_ER01/portlet/pom.xml epp/portal/tags/EPP_5_2_2_ER01/portlet/web/pom.xml epp/portal/tags/EPP_5_2_2_ER01/server/jboss/patch-ear/pom.xml epp/portal/tags/EPP_5_2_2_ER01/server/jboss/plugin/pom.xml epp/portal/tags/EPP_5_2_2_ER01/server/jboss/pom.xml epp/portal/tags/EPP_5_2_2_ER01/server/pom.xml epp/portal/tags/EPP_5_2_2_ER01/starter/ear/pom.xml epp/portal/tags/EPP_5_2_2_ER01/starter/jar/pom.xml epp/portal/tags/EPP_5_2_2_ER01/starter/pom.xml epp/portal/tags/EPP_5_2_2_ER01/starter/war/pom.xml epp/portal/tags/EPP_5_2_2_ER01/testsuite/pom.xml epp/portal/tags/EPP_5_2_2_ER01/testsuite/selenium-snifftests/pom.xml epp/portal/tags/EPP_5_2_2_ER01/testsuite/webuibasedsamples/pom.xml epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/pom.xml epp/portal/tags/EPP_5_2_2_ER01/web/pom.xml epp/portal/tags/EPP_5_2_2_ER01/web/portal/pom.xml epp/portal/tags/EPP_5_2_2_ER01/web/rest/pom.xml epp/portal/tags/EPP_5_2_2_ER01/webui/core/pom.xml epp/portal/tags/EPP_5_2_2_ER01/webui/dashboard/pom.xml epp/portal/tags/EPP_5_2_2_ER01/webui/eXo/pom.xml epp/portal/tags/EPP_5_2_2_ER01/webui/framework/pom.xml epp/portal/tags/EPP_5_2_2_ER01/webui/pom.xml epp/portal/tags/EPP_5_2_2_ER01/webui/portal/pom.xml epp/portal/tags/EPP_5_2_2_ER01/webui/portlet/pom.xml epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-component/pom.xml epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-config/pom.xml epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-ear-as5/pom.xml epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-ear/pom.xml epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-war/pom.xml epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/pom.xml Log: New release Property changes on: epp/portal/tags/EPP_5_2_2_ER01 ___________________________________________________________________ Added: svn:ignore + *.iml .idea .settings .classpath .project .git .gitignore target Added: svn:mergeinfo + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4868,4875,4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5644,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/branches/xss:7377-7595,7597 /portal/branches/xss-issues:7350-7351,7358 /portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7409,7412,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7741,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072 Modified: epp/portal/tags/EPP_5_2_2_ER01/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/application-registry/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/common/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Deleted: epp/portal/tags/EPP_5_2_2_ER01/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/common/src/main/java/conf/configuration-jboss.properties 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,74 +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. -# - -# -gatein.conf.dir=${jboss.server.home.dir}/conf/gatein -gatein.data.dir=${jboss.server.data.dir}/gatein - -# DB -gatein.db.data.dir=${gatein.data.dir}/db - -# JCR -gatein.jcr.config.type=local -gatein.jcr.datasource.name=java:gatein-jcr -gatein.jcr.datasource.dialect=auto - -gatein.jcr.data.dir=${gatein.data.dir}/jcr -gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml -gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml -gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene -gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter -gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml -gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml -gatein.jcr.workspace.default=collaboration -gatein.jcr.workspace.system=system - -# IDM -gatein.idm.datasource.name=java:gatein-idm - -# EMail -gatein.email.smtp.username= -gatein.email.smtp.password= -gatein.email.smtp.host=smtp.gmail.com -gatein.email.smtp.port=465 -gatein.email.smtp.starttls.enable=true -gatein.email.smtp.auth=true -gatein.email.smtp.socketFactory.port=465 -gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory - -# Portlet container configuration -gatein.portlet.validation=true -gatein.portlet.config=${gatein.conf.dir}/portlet.xml - -# Portal configuration -gatein.portal.idm.createuserportal=false -gatein.portal.idm.destroyuserportal=true -gatein.portal.controller.config=${gatein.conf.dir}/controller.xml - -# key files for gadget -gatein.gadgets.securitytokenkeyfile=${gatein.conf.dir}/gadgets/key.txt -gatein.gadgets.signingkeyfile=${gatein.conf.dir}/gadgets/oauthkey.pem - -# Site Publisher (Can be removed if Site publisher isn't used) -wcm.linkjob.cron.expression=0 0/20 * * * ? - -# Commons Upgrade configuration -commons.upgrade.proceedIfFirstRun=true - Copied: epp/portal/tags/EPP_5_2_2_ER01/component/common/src/main/java/conf/configuration-jboss.properties (from rev 8761, epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/component/common/src/main/java/conf/configuration-jboss.properties (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/component/common/src/main/java/conf/configuration-jboss.properties 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,75 @@ +# +# 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. +# + +# +gatein.conf.dir=${jboss.server.home.dir}/conf/gatein +gatein.data.dir=${jboss.server.data.dir}/gatein + +# DB +gatein.db.data.dir=${gatein.data.dir}/db + +# JCR +gatein.jcr.config.type=local +gatein.jcr.datasource.name=java:gatein-jcr +gatein.jcr.datasource.dialect=auto + +gatein.jcr.data.dir=${gatein.data.dir}/jcr +gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values +gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.cache.config.workspace.portal-system=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config_portal-system.xml +gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml +gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene +gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter +gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml +gatein.jcr.workspace.default=collaboration +gatein.jcr.workspace.system=system + +# IDM +gatein.idm.datasource.name=java:gatein-idm + +# EMail +gatein.email.smtp.username= +gatein.email.smtp.password= +gatein.email.smtp.host=smtp.gmail.com +gatein.email.smtp.port=465 +gatein.email.smtp.starttls.enable=true +gatein.email.smtp.auth=true +gatein.email.smtp.socketFactory.port=465 +gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory + +# Portlet container configuration +gatein.portlet.validation=true +gatein.portlet.config=${gatein.conf.dir}/portlet.xml + +# Portal configuration +gatein.portal.idm.createuserportal=false +gatein.portal.idm.destroyuserportal=true +gatein.portal.controller.config=${gatein.conf.dir}/controller.xml + +# key files for gadget +gatein.gadgets.securitytokenkeyfile=${gatein.conf.dir}/gadgets/key.txt +gatein.gadgets.signingkeyfile=${gatein.conf.dir}/gadgets/oauthkey.pem + +# Site Publisher (Can be removed if Site publisher isn't used) +wcm.linkjob.cron.expression=0 0/20 * * * ? + +# Commons Upgrade configuration +commons.upgrade.proceedIfFirstRun=true + Modified: epp/portal/tags/EPP_5_2_2_ER01/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/identity/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/initializer/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/initializer/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/initializer/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -3,7 +3,7 @@ <parent> <artifactId>exo.portal.component</artifactId> <groupId>org.exoplatform.portal</groupId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/management/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/pc/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/portal/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/resources/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/scripting/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/test/core/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/test/jcr/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/test/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/web/api/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/web/controller/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/web/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/web/resources/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/web/security/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/component/web/server/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/examples/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/gatein-management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/gatein-management/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/gatein-management/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <groupId>org.jboss.portal</groupId> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/portletbridge/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>gatein</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -4,7 +4,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>integration</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/jboss-epp/serverAddon/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Deleted: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/build.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/build.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,449 +0,0 @@ -<project name="packageEPP" default="svn"> - <!-- - expecting those parameters: - svn.base - Base sv - - <ant antfile="src/build.xml" inheritRefs="true"> - <target name="mead-build"/> - <property name="mead.svn.base" value="http://anonsvn.jboss.org/repos"/> - <property name="mead.svn.repo" value="gatein"/> - <property name="mead.svn.path" value="maven/parent/tags/1.0.2-GA"/> - - <property name="mead.build.profiles" value="default distribution-epp"/> - <property name="mead.build.properties" value="aaa=bbb ccc=ddd"/> - <property name="mead.patch.path" value="/maven/parent/tags/1.0.2-GA"/> - </ant> - - execute - mvn package -P mead-all [-Dbrew.exec [-Dbrew.not.wait]] [-Dbrew.not.scratch] [-Dimport.dependencies] - - brew.exec - will execute Brew bild. Brew binary must be installed om build mashine. - brew.no.wait - If not declared, build waits until task is done and synchronized - brew.not.scratch - Performs scratch build unless specified. This prevents from unwanted execution. - - --> - - <!-- DOCUMENTATION --> - <target name="build-doc"> - <antcall target="scm-co" inheritRefs="true" inheritAll="true" /> - - <echo>Generating doc output to ${ant.build.dir}/mvn.doc.log</echo> - <exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/mvn.doc.log" failonerror="true" failifexecutionfails=""> - <arg value="clean"/> - <arg value="javadoc:aggregate"/> - </exec> - <copy todir="${doc.target.dir}/${doc.path}"> - <fileset dir="${scm.dir}/target/site/apidocs"> - </fileset> - </copy> - </target> - - <!-- SOURCE --> - <target name="build-src"> - - <antcall target="scm-co" inheritRefs="true" inheritAll="true" /> - - <copy todir="${source.target.dir}/${source.path}"> - <fileset dir="${scm.dir}"> - <exclude name="**/.git"/> - <exclude name="**/.git/**"/> - <exclude name="**/.gitattributes"/> - <exclude name="**/.gitignore"/> - <exclude name="**/.gitmodules"/> - <exclude name="**/.hg"/> - <exclude name="**/.hg/**"/> - <exclude name="**/.hgignore"/> - <exclude name="**/.hgsub"/> - <exclude name="**/.hgsubstate"/> - <exclude name="**/.hgtags"/> - <exclude name="**/.bzr"/> - <exclude name="**/.bzr/**"/> - <exclude name="**/.bzrignore"/> - </fileset> - </copy> - </target> - - <target name="settings"> - - <property name="ant.build.dir">target</property> - <mkdir dir="${ant.build.dir}"/> - - <property name="scm.dir">${ant.build.dir}/scm.source/</property> - - <property name="source.target.dir">${ant.build.dir}/source</property> - <property name="doc.target.dir">${ant.build.dir}/doc</property> - - <!-- SVN --> - <property name="svn.base">http://anonsvn.jboss.org/repos</property> - <property name="svn.repo">gatein</property> - - <!-- GIT --> - <property name="git.base">git://git.app.eng.bos.redhat.com</property> - <property name="git.repo">gatein</property> - </target> - - <target name="scm-global"> - <property name="scm.url">${scm.base}/${scm.repo}/${scm.path}</property> - </target> - - <target name="scm-co" depends="scm-global"> - <antcall target="scm-co-${scm.type}" inheritRefs="true" inheritAll="true" /> - </target> - - <target name="scm-revision" depends="scm-global"> - <antcall target="scm-revision-${scm.type}" inheritRefs="true" inheritAll="true" /> - </target> - - <target name="scm-revision-svn"> - <echo>Get revision SVN ${scm.url}</echo> - <exec executable="${cmd.svn}" output="${ant.build.dir}/svn.properties" failonerror="true" failifexecutionfails="true"> - <arg value="info" /> - <arg value="${scm.url}" /> - </exec> - - <loadfile property="scm.revision" srcFile="${ant.build.dir}/svn.properties"> - <filterchain> - <linecontains> - <contains value="Last Changed Rev" /> - </linecontains> - <deletecharacters chars="\n"/> - <deletecharacters chars="Last Changed Rev: "/> - </filterchain> - </loadfile> - <echo>Last Changed Rev: "${scm.revision}"</echo> - <echo file="${ant.build.dir}/scm.revision">${scm.revision}</echo> - </target> - - <target name="scm-co-svn" depends="scm.dir.check" unless="scm.dir.exists"> - <echo>Checkout SVN ${scm.url}</echo> - <exec executable="${cmd.svn}" output="${ant.build.dir}/svn.log" failonerror="true" failifexecutionfails=""> - <arg value="co"/> - <arg value="${scm.url}" /> - <arg line="${scm.dir}" /> - </exec> - - </target> - - <target name="scm-co-git" depends="scm-revision-git"> - <echo>Checkout GIT ${scm.url}</echo> - - <echo>Checkout source code</echo> - <!-- git reset - -hard $scm.revision --> - <exec executable="${cmd.git}" dir="${scm.dir}" output="${ant.build.dir}/scm.log" append="true" failonerror="true" failifexecutionfails=""> - <arg value="reset"/> - <arg value="--hard"/> - <arg value="${scm.revision}"/> - </exec> - - </target> - - <target name="scm-clone-git" depends="scm.dir.check" unless="scm.dir.exists"> - <echo>Clone from GIT ${scm.url} output to ${ant.build.dir}/scm.log</echo> - <!-- git clone git://git.app.eng.bos.redhat.com/apache/shindig.git source --> - <exec executable="${cmd.git}" output="${ant.build.dir}/scm.log" failonerror="true" failifexecutionfails=""> - <arg value="clone"/> - <arg value="${scm.url}" /> - <arg line="${scm.dir}" /> - </exec> - - </target> - <target name="scm-revision-git" depends="scm-clone-git"> - <echo>Get revision GIT ${scm.url}</echo> - <echo>Resolve GIT revision for ${scm.version}</echo> - <!-- scm.revision=`git rev-list - -max-count=1 2.0.2-Beta03 --> - <exec executable="${cmd.git}" dir="${scm.dir}" outputproperty="scm.revision" failonerror="true" failifexecutionfails=""> - <arg value="rev-list"/> - <arg value="--max-count=1"/> - <arg value="${scm.version}"/> - </exec> - <echo>Last Changed Rev: "${scm.revision}"</echo> - <echo file="${ant.build.dir}/scm.revision">${scm.revision}</echo> - </target> - - <target name="scm.dir.check"> - <condition property="scm.dir.exists"> - <available file="${scm.dir}" type="dir"/> - </condition> - </target> - - <!-- MEAD BUILD --> - - <target name="brew-url-git"> - <echo file="${ant.build.dir}/brew.url">${scm.base}/${scm.repo}/${scm.path}#${scm.revision}</echo> - </target> - <target name="brew-url-svn"> - <echo file="${ant.build.dir}/brew.url">${scm.type}+${scm.base}/${scm.repo}?${scm.path}#${scm.revision}</echo> - </target> - - <target name="mead-build" depends="patch,profiles,properties,brew-build-scratch-no,brew-build-scratch-yes,scm-revision"> - - <loadfile property="scm.revision" srcFile="${ant.build.dir}/scm.revision"/> - - <antcall target="brew-url-${scm.type}" inheritRefs="true" inheritAll="true" /> - <loadfile property="brew.url" srcFile="${ant.build.dir}/brew.url"/> - - <property name="mead.properties">${mead.build.properties}</property> - <property name="mead.profiles">${mead.build.profiles}</property> - - - <echo></echo> - <echo>${cmd.brew} mead-build ${mead.target} '${brew.url}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch}</echo> - <echo></echo> -<echo file="${brew.commands.file}" append="true"> -# Name: ${project.name} -${cmd.brew} mead-build ${mead.target} '${brew.url}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch} - -</echo> - - <antcall target="brew-build-exec"/> - - </target> - - <!-- PATCH --> - <target name="patch" depends="patch-cond-if,patch-cond-else" /> - <target name="patch-cond"> - <condition property="patch-cond-is-true"> - <and> - <not><equals arg1="${mead.patch.path}" arg2=""/></not> - <isset property="mead.patch.path"/> - </and> - </condition> - </target> - <target name="patch-cond-if" depends="patch-cond" if="patch-cond-is-true"> - <echo>mead.patch.path is set</echo> - <property name="svnpatchurl">${svn.patch.base}/${mead.patch.path}</property> - - <echo>Getting revision for patch ${svnpatchurl}</echo> - <exec executable="${cmd.svn}" output="${ant.build.dir}/svnpatch.properties" failonerror="true" failifexecutionfails="true"> - <arg value="info" /> - <arg value="${svnpatchurl}" /> - </exec> - - <loadfile property="svnpatch.revision" srcFile="${ant.build.dir}/svnpatch.properties"> - <filterchain> - <linecontains> - <contains value="Last Changed Rev" /> - </linecontains> - <deletecharacters chars="\n"/> - <deletecharacters chars="Last Changed Rev: "/> - </filterchain> - </loadfile> - <echo>Patch Revision: "${svnpatch.revision}"</echo> - - <property name="mead.patch">--patches 'svn+${svn.patch.base}?${mead.patch.path}#${svnpatch.revision}'</property> - </target> - - <target name="patch-cond-else" depends="patch-cond" unless="patch-cond-is-true"> - <echo>mead.patch.path is NOT set</echo> - <property name="mead.patch" value=""/> - </target> - - <!-- PROFILES --> - <target name="profiles" depends="profiles-cond-if,profiles-cond-else" /> - <target name="profiles-cond"> - <condition property="profiles-cond-is-true"> - <and> - <not><equals arg1="${mead.build.profiles}" arg2=""/></not> - <isset property="mead.build.profiles"/> - </and> - </condition> - </target> - <target name="profiles-cond-if" depends="profiles-cond" if="profiles-cond-is-true"> - <echo>mead.build.profiles is set</echo> - <echo file="${ant.build.dir}/profiles.properties"> ${mead.build.profiles}</echo> - <loadfile property="mead.profiles" srcFile="${ant.build.dir}/profiles.properties"> - <filterchain> - <replaceregex flags="g" pattern=" " replace=" --profile "/> - </filterchain> - </loadfile> - </target> - <target name="profiles-cond-else" depends="profiles-cond" unless="profiles-cond-is-true"> - <echo>mead.build.profiles is NOT set</echo> - <property name="mead.profiles" value=""/> - </target> - - <!-- PROPERIES --> - <target name="properties" depends="properties-cond-if,properties-cond-else" /> - <target name="properties-cond"> - <condition property="properties-cond-is-true"> - <and> - <not><equals arg1="${mead.build.properties}" arg2=""/></not> - <isset property="mead.build.properties"/> - </and> - </condition> - </target> - <target name="properties-cond-if" depends="properties-cond" if="properties-cond-is-true"> - <echo>mead.build.properties is set</echo> - <echo file="${ant.build.dir}/properties.properties"> ${mead.build.properties}</echo> - <loadfile property="mead.properties" srcFile="${ant.build.dir}/properties.properties"> - <filterchain> - <replaceregex flags="g" pattern=" " replace=" --property "/> - </filterchain> - </loadfile> - </target> - <target name="properties-cond-else" depends="properties-cond" unless="properties-cond-is-true"> - <echo>mead.build.properties is NOT set</echo> - <property name="mead.properties" value=""/> - </target> - - <!-- EXECUTE MEAD BUILD --> - <target name="brew-build-exec" if="brew.exec"> - - <exec executable="${cmd.brew}" output="${ant.build.dir}/task.properties" failonerror="true" failifexecutionfails=""> - <arg value="maven-build"/> - <arg value="${mead.target}"/> - <arg value="${brew.url}" /> - <arg line="${mead.patch} ${mead.profiles} ${mead.properties} ${brew.build.scratch} ${mead.parameters}" /> - </exec> - <!-- FOR TESTING --> - <!--<echo file="${ant.build.dir}/task.properties">--> -<!--Created task: 3399568--> -<!--Task info: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=3399568--> -<!--Watching tasks (this may be safely interrupted)...--> -<!--3399568 maven (jboss-epp-5-nosign, /repos/gatein:components/wsrp/tags/2.0.1-EPP511-CR01:6602): free--> -<!--3399568 maven (jboss-epp-5-nosign, /repos/gatein:components/wsrp/tags/2.0.1-EPP511-CR01:6602): free -> open (x86-003.build.bos.redhat.com)--> - <!--3399569 buildMaven (jboss-epp-5-build): open (x86-006.build.bos.redhat.com)--> - <!--</echo>--> - - <loadfile property="mead.task.id" srcFile="${ant.build.dir}/task.properties"> - <filterchain> - <linecontains> - <contains value="Created task: " /> - </linecontains> - <deletecharacters chars="\n"/> - <deletecharacters chars="Created task: "/> - </filterchain> - </loadfile> - - <echo>Task ID: "${mead.task.id}" go to https://brewweb.devel.redhat.com/taskinfo?taskID=${mead.task.id}</echo... - <antcall target="brew-build-wait"/> - - </target> - - <!-- SCRATCH --> - <target name="brew-build-scratch-no" if="brew.not.scratch"> - <property name="brew.build.scratch"> </property> - </target> - <target name="brew-build-scratch-yes" unless="brew.not.scratch"> - <property name="brew.build.scratch">--scratch</property> - </target> - - <!-- BREW WAIT --> - <target name="brew-build-wait" unless="brew.not.wait"> - <echo>Task ID: "${mead.task.id}"</echo> - - <!-- Wait until task ends to get build ID --> - <exec executable="${cmd.brew}" output="${ant.build.dir}/taskwatch.properties" failonerror="true" failifexecutionfails=""> - <arg value="watch-task"/> - <arg value="${mead.task.id}"/> - </exec> - - <!-- Parse taskinfo to get build ID --> - <exec executable="${cmd.brew}" output="${ant.build.dir}/taskinfo.properties" failonerror="true" failifexecutionfails=""> - <arg value="taskinfo"/> - <arg value="${mead.task.id}"/> - </exec> - <!-- FOR TESTING --> - <!--<echo file="${ant.build.dir}/taskinfo.properties">--> -<!--Task: 3375489--> -<!--Type: maven--> -<!--Owner: hfnukal--> -<!--State: closed--> -<!--Created: Wed Jun 8 01:39:18 2011--> -<!--Started: Wed Jun 8 01:39:20 2011--> -<!--Finished: Wed Jun 8 02:26:24 2011--> -<!--Host: x86-007.build.bos.redhat.com--> -<!--Build: org.exoplatform.portal-exo.portal.parent-5.1.1_epp_DEV02-1 (166768)--> - <!--</echo>--> - - <loadfile property="mead.build.id" srcFile="${ant.build.dir}/taskinfo.properties"> - <filterchain> - <linecontains> - <contains value="Build: " /> - </linecontains> - <deletecharacters chars="\n"/> - <replaceregex pattern="Build: (.*) \(.*" replace="\1"/> - </filterchain> - </loadfile> - - <echo>Build ID: "${mead.build.id}"</echo> - - <echo>EXEC: ${cmd.brew} wait-repo --target jboss-epp-5 --build ${mead.build.id}</echo> - - </target> - - <!-- IMPORT DEPENDENCIES --> - <target name="mead-import-dependencies"> - - <echo>Checkout from SCM</echo> - <antcall target="scm-co" inheritRefs="true" inheritAll="true" /> - - <echo>Resolve dependencies output to ${ant.build.dir}/mvn.resolve.log</echo> - <exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/mvn.resolve.log" failonerror="true" failifexecutionfails=""> - <arg value="dependency:resolve"/> - <arg value="-s../../../../../settings-all.xml"/> - </exec> - - <echo>Dependency list output to ${ant.build.dir}/mvn.dependency.list</echo> - <exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/mvn.dependency.list" failonerror="true" failifexecutionfails=""> - <arg value="dependency:list"/> - </exec> - - <echo>Parse file output to ${ant.build.dir}/mvn.dependency.list.filtered</echo> - <loadfile property="mvn.dependency.list" srcFile="${ant.build.dir}/mvn.dependency.list"> - <filterchain> - <linecontainsregexp> - <regexp pattern=":[a-zA-Z0-9\.]*:[a-zA-Z0-9\.]*:[a-zA-Z0-9\.]*" /> - </linecontainsregexp> - <!--<deletecharacters chars="\[INFO\]"/>--> - <replaceregex pattern="\[INFO\]" replace=""/> - <replaceregex pattern=":[a-z]*$" replace=""/> - <trim/> - <sortfilter/> - <uniqfilter/> - <linecontains negate="true"> - <contains value="org.gatein"/> - </linecontains> - <linecontains negate="true"> - <contains value="org.exoplatform"/> - </linecontains> - <linecontains negate="true"> - <contains value="org.picketlink"/> - </linecontains> - </filterchain> - </loadfile> - <echo file="${ant.build.dir}/mvn.dependency.list.filtered">${mvn.dependency.list}</echo> - - <!--Execute import --> - <echo>Import output to ${ant.build.dir}/import.log</echo> - <exec executable="bash" dir="../src/brewscripts/" output="${ant.build.dir}/import.log" failonerror="true" failifexecutionfails=""> - <arg value="import-file"/> - <arg value="${ant.build.dir}/mvn.dependency.list.filtered"/> - </exec> - </target> - - <!-- Imports all dependencies with mikes script --> - <!-- TODO: It should contain build params to deploy correctly, now most components fails due lack of params --> - <!-- So maybe I will see thin in bz --> - <target name="mead-import-all-dependencies"> - - <echo>Checkout from SCM</echo> - <antcall target="scm-co" inheritRefs="true" inheritAll="true" /> - - <echo>Resolve dependencies output to ${ant.build.dir}/my-project-build.txt</echo> - <exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/my-project-build.txt" failonerror="true" failifexecutionfails=""> - <arg value="-DaltDeploymentRepository=test.repo::default::file://${ant.build.dir}/mvn-deploy-repo"/> - <arg value="dependency:resolve-plugins"/> - <arg value="deploy"/> - </exec> - - <!--Execute import --> - <echo>Import output to ${ant.build.dir}/import-all.log</echo> - <exec executable="python" dir="../src/brewscripts/" output="${ant.build.dir}/import-all.log" failonerror="true" failifexecutionfails=""> - <arg value="mead-load-build-dependencies"/> - <arg line="--exclude org.gatein --exclude org.exoplatform --exclude org.picketlink ${ant.build.dir}/my-project-build.txt"/> - </exec> - - </target> - -</project> Copied: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/build.xml (from rev 8762, epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/build.xml (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/build.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,449 @@ +<project name="packageEPP" default="svn"> + <!-- + expecting those parameters: + svn.base - Base sv + + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="mead-build"/> + <property name="mead.svn.base" value="http://anonsvn.jboss.org/repos"/> + <property name="mead.svn.repo" value="gatein"/> + <property name="mead.svn.path" value="maven/parent/tags/1.0.2-GA"/> + + <property name="mead.build.profiles" value="default distribution-epp"/> + <property name="mead.build.properties" value="aaa=bbb ccc=ddd"/> + <property name="mead.patch.path" value="/maven/parent/tags/1.0.2-GA"/> + </ant> + + execute + mvn package -P mead-all [-Dbrew.exec [-Dbrew.not.wait]] [-Dbrew.not.scratch] [-Dimport.dependencies] + + brew.exec - will execute Brew bild. Brew binary must be installed om build mashine. + brew.no.wait - If not declared, build waits until task is done and synchronized + brew.not.scratch - Performs scratch build unless specified. This prevents from unwanted execution. + + --> + + <!-- DOCUMENTATION --> + <target name="build-doc"> + <antcall target="scm-co" inheritRefs="true" inheritAll="true" /> + + <echo>Generating doc output to ${ant.build.dir}/mvn.doc.log</echo> + <exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/mvn.doc.log" failonerror="true" failifexecutionfails=""> + <arg value="clean"/> + <arg value="javadoc:aggregate"/> + </exec> + <copy todir="${doc.target.dir}/${doc.path}"> + <fileset dir="${scm.dir}/target/site/apidocs"> + </fileset> + </copy> + </target> + + <!-- SOURCE --> + <target name="build-src"> + + <antcall target="scm-co" inheritRefs="true" inheritAll="true" /> + + <copy todir="${source.target.dir}/${source.path}"> + <fileset dir="${scm.dir}"> + <exclude name="**/.git"/> + <exclude name="**/.git/**"/> + <exclude name="**/.gitattributes"/> + <exclude name="**/.gitignore"/> + <exclude name="**/.gitmodules"/> + <exclude name="**/.hg"/> + <exclude name="**/.hg/**"/> + <exclude name="**/.hgignore"/> + <exclude name="**/.hgsub"/> + <exclude name="**/.hgsubstate"/> + <exclude name="**/.hgtags"/> + <exclude name="**/.bzr"/> + <exclude name="**/.bzr/**"/> + <exclude name="**/.bzrignore"/> + </fileset> + </copy> + </target> + + <target name="settings"> + + <property name="ant.build.dir">target</property> + <mkdir dir="${ant.build.dir}"/> + + <property name="scm.dir">${ant.build.dir}/scm.source/</property> + + <property name="source.target.dir">${ant.build.dir}/source</property> + <property name="doc.target.dir">${ant.build.dir}/doc</property> + + <!-- SVN --> + <property name="svn.base">http://anonsvn.jboss.org/repos</property> + <property name="svn.repo">gatein</property> + + <!-- GIT --> + <property name="git.base">git://git.app.eng.bos.redhat.com</property> + <property name="git.repo">gatein</property> + </target> + + <target name="scm-global"> + <property name="scm.url">${scm.base}/${scm.repo}/${scm.path}</property> + </target> + + <target name="scm-co" depends="scm-global"> + <antcall target="scm-co-${scm.type}" inheritRefs="true" inheritAll="true" /> + </target> + + <target name="scm-revision" depends="scm-global"> + <antcall target="scm-revision-${scm.type}" inheritRefs="true" inheritAll="true" /> + </target> + + <target name="scm-revision-svn"> + <echo>Get revision SVN ${scm.url}</echo> + <exec executable="${cmd.svn}" output="${ant.build.dir}/svn.properties" failonerror="true" failifexecutionfails="true"> + <arg value="info" /> + <arg value="${scm.url}" /> + </exec> + + <loadfile property="scm.revision" srcFile="${ant.build.dir}/svn.properties"> + <filterchain> + <linecontains> + <contains value="Last Changed Rev" /> + </linecontains> + <deletecharacters chars="\n"/> + <deletecharacters chars="Last Changed Rev: "/> + </filterchain> + </loadfile> + <echo>Last Changed Rev: "${scm.revision}"</echo> + <echo file="${ant.build.dir}/scm.revision">${scm.revision}</echo> + </target> + + <target name="scm-co-svn" depends="scm.dir.check" unless="scm.dir.exists"> + <echo>Checkout SVN ${scm.url}</echo> + <exec executable="${cmd.svn}" output="${ant.build.dir}/svn.log" failonerror="true" failifexecutionfails=""> + <arg value="co"/> + <arg value="${scm.url}" /> + <arg line="${scm.dir}" /> + </exec> + + </target> + + <target name="scm-co-git" depends="scm-revision-git"> + <echo>Checkout GIT ${scm.url}</echo> + + <echo>Checkout source code</echo> + <!-- git reset - -hard $scm.revision --> + <exec executable="${cmd.git}" dir="${scm.dir}" output="${ant.build.dir}/scm.log" append="true" failonerror="true" failifexecutionfails=""> + <arg value="reset"/> + <arg value="--hard"/> + <arg value="${scm.revision}"/> + </exec> + + </target> + + <target name="scm-clone-git" depends="scm.dir.check" unless="scm.dir.exists"> + <echo>Clone from GIT ${scm.url} output to ${ant.build.dir}/scm.log</echo> + <!-- git clone git://git.app.eng.bos.redhat.com/apache/shindig.git source --> + <exec executable="${cmd.git}" output="${ant.build.dir}/scm.log" failonerror="true" failifexecutionfails=""> + <arg value="clone"/> + <arg value="${scm.url}" /> + <arg line="${scm.dir}" /> + </exec> + + </target> + <target name="scm-revision-git" depends="scm-clone-git"> + <echo>Get revision GIT ${scm.url}</echo> + <echo>Resolve GIT revision for ${scm.version}</echo> + <!-- scm.revision=`git rev-list - -max-count=1 2.0.2-Beta03 --> + <exec executable="${cmd.git}" dir="${scm.dir}" outputproperty="scm.revision" failonerror="true" failifexecutionfails=""> + <arg value="rev-list"/> + <arg value="--max-count=1"/> + <arg value="${scm.version}"/> + </exec> + <echo>Last Changed Rev: "${scm.revision}"</echo> + <echo file="${ant.build.dir}/scm.revision">${scm.revision}</echo> + </target> + + <target name="scm.dir.check"> + <condition property="scm.dir.exists"> + <available file="${scm.dir}" type="dir"/> + </condition> + </target> + + <!-- MEAD BUILD --> + + <target name="brew-url-git"> + <echo file="${ant.build.dir}/brew.url">${scm.base}/${scm.repo}/${scm.path}#${scm.revision}</echo> + </target> + <target name="brew-url-svn"> + <echo file="${ant.build.dir}/brew.url">${scm.type}+${scm.base}/${scm.repo}?${scm.path}#${scm.revision}</echo> + </target> + + <target name="mead-build" depends="patch,profiles,properties,brew-build-scratch-no,brew-build-scratch-yes,scm-revision"> + + <loadfile property="scm.revision" srcFile="${ant.build.dir}/scm.revision"/> + + <antcall target="brew-url-${scm.type}" inheritRefs="true" inheritAll="true" /> + <loadfile property="brew.url" srcFile="${ant.build.dir}/brew.url"/> + + <property name="mead.properties">${mead.build.properties}</property> + <property name="mead.profiles">${mead.build.profiles}</property> + + + <echo></echo> + <echo>${cmd.brew} maven-build ${mead.target} '${brew.url}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch}</echo> + <echo></echo> +<echo file="${brew.commands.file}" append="true"> +# Name: ${project.name} +${cmd.brew} maven-build ${mead.target} '${brew.url}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch} + +</echo> + + <antcall target="brew-build-exec"/> + + </target> + + <!-- PATCH --> + <target name="patch" depends="patch-cond-if,patch-cond-else" /> + <target name="patch-cond"> + <condition property="patch-cond-is-true"> + <and> + <not><equals arg1="${mead.patch.path}" arg2=""/></not> + <isset property="mead.patch.path"/> + </and> + </condition> + </target> + <target name="patch-cond-if" depends="patch-cond" if="patch-cond-is-true"> + <echo>mead.patch.path is set</echo> + <property name="svnpatchurl">${svn.patch.base}/${mead.patch.path}</property> + + <echo>Getting revision for patch ${svnpatchurl}</echo> + <exec executable="${cmd.svn}" output="${ant.build.dir}/svnpatch.properties" failonerror="true" failifexecutionfails="true"> + <arg value="info" /> + <arg value="${svnpatchurl}" /> + </exec> + + <loadfile property="svnpatch.revision" srcFile="${ant.build.dir}/svnpatch.properties"> + <filterchain> + <linecontains> + <contains value="Last Changed Rev" /> + </linecontains> + <deletecharacters chars="\n"/> + <deletecharacters chars="Last Changed Rev: "/> + </filterchain> + </loadfile> + <echo>Patch Revision: "${svnpatch.revision}"</echo> + + <property name="mead.patch">--patches 'svn+${svn.patch.base}?${mead.patch.path}#${svnpatch.revision}'</property> + </target> + + <target name="patch-cond-else" depends="patch-cond" unless="patch-cond-is-true"> + <echo>mead.patch.path is NOT set</echo> + <property name="mead.patch" value=""/> + </target> + + <!-- PROFILES --> + <target name="profiles" depends="profiles-cond-if,profiles-cond-else" /> + <target name="profiles-cond"> + <condition property="profiles-cond-is-true"> + <and> + <not><equals arg1="${mead.build.profiles}" arg2=""/></not> + <isset property="mead.build.profiles"/> + </and> + </condition> + </target> + <target name="profiles-cond-if" depends="profiles-cond" if="profiles-cond-is-true"> + <echo>mead.build.profiles is set</echo> + <echo file="${ant.build.dir}/profiles.properties"> ${mead.build.profiles}</echo> + <loadfile property="mead.profiles" srcFile="${ant.build.dir}/profiles.properties"> + <filterchain> + <replaceregex flags="g" pattern=" " replace=" --profile "/> + </filterchain> + </loadfile> + </target> + <target name="profiles-cond-else" depends="profiles-cond" unless="profiles-cond-is-true"> + <echo>mead.build.profiles is NOT set</echo> + <property name="mead.profiles" value=""/> + </target> + + <!-- PROPERIES --> + <target name="properties" depends="properties-cond-if,properties-cond-else" /> + <target name="properties-cond"> + <condition property="properties-cond-is-true"> + <and> + <not><equals arg1="${mead.build.properties}" arg2=""/></not> + <isset property="mead.build.properties"/> + </and> + </condition> + </target> + <target name="properties-cond-if" depends="properties-cond" if="properties-cond-is-true"> + <echo>mead.build.properties is set</echo> + <echo file="${ant.build.dir}/properties.properties"> ${mead.build.properties}</echo> + <loadfile property="mead.properties" srcFile="${ant.build.dir}/properties.properties"> + <filterchain> + <replaceregex flags="g" pattern=" " replace=" --property "/> + </filterchain> + </loadfile> + </target> + <target name="properties-cond-else" depends="properties-cond" unless="properties-cond-is-true"> + <echo>mead.build.properties is NOT set</echo> + <property name="mead.properties" value=""/> + </target> + + <!-- EXECUTE MEAD BUILD --> + <target name="brew-build-exec" if="brew.exec"> + + <exec executable="${cmd.brew}" output="${ant.build.dir}/task.properties" failonerror="true" failifexecutionfails=""> + <arg value="maven-build"/> + <arg value="${mead.target}"/> + <arg value="${brew.url}" /> + <arg line="${mead.patch} ${mead.profiles} ${mead.properties} ${brew.build.scratch} ${mead.parameters}" /> + </exec> + <!-- FOR TESTING --> + <!--<echo file="${ant.build.dir}/task.properties">--> +<!--Created task: 3399568--> +<!--Task info: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=3399568--> +<!--Watching tasks (this may be safely interrupted)...--> +<!--3399568 maven (jboss-epp-5-nosign, /repos/gatein:components/wsrp/tags/2.0.1-EPP511-CR01:6602): free--> +<!--3399568 maven (jboss-epp-5-nosign, /repos/gatein:components/wsrp/tags/2.0.1-EPP511-CR01:6602): free -> open (x86-003.build.bos.redhat.com)--> + <!--3399569 buildMaven (jboss-epp-5-build): open (x86-006.build.bos.redhat.com)--> + <!--</echo>--> + + <loadfile property="mead.task.id" srcFile="${ant.build.dir}/task.properties"> + <filterchain> + <linecontains> + <contains value="Created task: " /> + </linecontains> + <deletecharacters chars="\n"/> + <deletecharacters chars="Created task: "/> + </filterchain> + </loadfile> + + <echo>Task ID: "${mead.task.id}" go to https://brewweb.devel.redhat.com/taskinfo?taskID=${mead.task.id}</echo... + <antcall target="brew-build-wait"/> + + </target> + + <!-- SCRATCH --> + <target name="brew-build-scratch-no" if="brew.not.scratch"> + <property name="brew.build.scratch"> </property> + </target> + <target name="brew-build-scratch-yes" unless="brew.not.scratch"> + <property name="brew.build.scratch">--scratch</property> + </target> + + <!-- BREW WAIT --> + <target name="brew-build-wait" unless="brew.not.wait"> + <echo>Task ID: "${mead.task.id}"</echo> + + <!-- Wait until task ends to get build ID --> + <exec executable="${cmd.brew}" output="${ant.build.dir}/taskwatch.properties" failonerror="true" failifexecutionfails=""> + <arg value="watch-task"/> + <arg value="${mead.task.id}"/> + </exec> + + <!-- Parse taskinfo to get build ID --> + <exec executable="${cmd.brew}" output="${ant.build.dir}/taskinfo.properties" failonerror="true" failifexecutionfails=""> + <arg value="taskinfo"/> + <arg value="${mead.task.id}"/> + </exec> + <!-- FOR TESTING --> + <!--<echo file="${ant.build.dir}/taskinfo.properties">--> +<!--Task: 3375489--> +<!--Type: maven--> +<!--Owner: hfnukal--> +<!--State: closed--> +<!--Created: Wed Jun 8 01:39:18 2011--> +<!--Started: Wed Jun 8 01:39:20 2011--> +<!--Finished: Wed Jun 8 02:26:24 2011--> +<!--Host: x86-007.build.bos.redhat.com--> +<!--Build: org.exoplatform.portal-exo.portal.parent-5.1.1_epp_DEV02-1 (166768)--> + <!--</echo>--> + + <loadfile property="mead.build.id" srcFile="${ant.build.dir}/taskinfo.properties"> + <filterchain> + <linecontains> + <contains value="Build: " /> + </linecontains> + <deletecharacters chars="\n"/> + <replaceregex pattern="Build: (.*) \(.*" replace="\1"/> + </filterchain> + </loadfile> + + <echo>Build ID: "${mead.build.id}"</echo> + + <echo>EXEC: ${cmd.brew} wait-repo --target jboss-epp-5 --build ${mead.build.id}</echo> + + </target> + + <!-- IMPORT DEPENDENCIES --> + <target name="mead-import-dependencies"> + + <echo>Checkout from SCM</echo> + <antcall target="scm-co" inheritRefs="true" inheritAll="true" /> + + <echo>Resolve dependencies output to ${ant.build.dir}/mvn.resolve.log</echo> + <exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/mvn.resolve.log" failonerror="true" failifexecutionfails=""> + <arg value="dependency:resolve"/> + <arg value="-s../../../../../settings-all.xml"/> + </exec> + + <echo>Dependency list output to ${ant.build.dir}/mvn.dependency.list</echo> + <exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/mvn.dependency.list" failonerror="true" failifexecutionfails=""> + <arg value="dependency:list"/> + </exec> + + <echo>Parse file output to ${ant.build.dir}/mvn.dependency.list.filtered</echo> + <loadfile property="mvn.dependency.list" srcFile="${ant.build.dir}/mvn.dependency.list"> + <filterchain> + <linecontainsregexp> + <regexp pattern=":[a-zA-Z0-9\.]*:[a-zA-Z0-9\.]*:[a-zA-Z0-9\.]*" /> + </linecontainsregexp> + <!--<deletecharacters chars="\[INFO\]"/>--> + <replaceregex pattern="\[INFO\]" replace=""/> + <replaceregex pattern=":[a-z]*$" replace=""/> + <trim/> + <sortfilter/> + <uniqfilter/> + <linecontains negate="true"> + <contains value="org.gatein"/> + </linecontains> + <linecontains negate="true"> + <contains value="org.exoplatform"/> + </linecontains> + <linecontains negate="true"> + <contains value="org.picketlink"/> + </linecontains> + </filterchain> + </loadfile> + <echo file="${ant.build.dir}/mvn.dependency.list.filtered">${mvn.dependency.list}</echo> + + <!--Execute import --> + <echo>Import output to ${ant.build.dir}/import.log</echo> + <exec executable="bash" dir="../src/brewscripts/" output="${ant.build.dir}/import.log" failonerror="true" failifexecutionfails=""> + <arg value="import-file"/> + <arg value="${ant.build.dir}/mvn.dependency.list.filtered"/> + </exec> + </target> + + <!-- Imports all dependencies with mikes script --> + <!-- TODO: It should contain build params to deploy correctly, now most components fails due lack of params --> + <!-- So maybe I will see thin in bz --> + <target name="mead-import-all-dependencies"> + + <echo>Checkout from SCM</echo> + <antcall target="scm-co" inheritRefs="true" inheritAll="true" /> + + <echo>Resolve dependencies output to ${ant.build.dir}/my-project-build.txt</echo> + <exec executable="${cmd.mvn}" dir="${scm.dir}" output="${ant.build.dir}/my-project-build.txt" failonerror="true" failifexecutionfails=""> + <arg value="-DaltDeploymentRepository=test.repo::default::file://${ant.build.dir}/mvn-deploy-repo"/> + <arg value="dependency:resolve-plugins"/> + <arg value="deploy"/> + </exec> + + <!--Execute import --> + <echo>Import output to ${ant.build.dir}/import-all.log</echo> + <exec executable="python" dir="../src/brewscripts/" output="${ant.build.dir}/import-all.log" failonerror="true" failifexecutionfails=""> + <arg value="mead-load-build-dependencies"/> + <arg line="--exclude org.gatein --exclude org.exoplatform --exclude org.picketlink ${ant.build.dir}/my-project-build.txt"/> + </exec> + + </target> + +</project> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-core/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-doc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-doc/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-jcr/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-junit/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-junit/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-kernel/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-kernel/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-parent/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-parent/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-ws/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/exo-ws/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-common/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-dep/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-dep/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-examples/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-examples/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-jon-plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-jon-plugin/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-jon-plugin/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-mop/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-mop/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-parent/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-parent/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-pc/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-portal/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-shindig/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-shindig/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-simplecaptcha/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-sso/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-sso/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-wci/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-wci/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-wsrp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/gatein-wsrp/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-eppsp/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-eppsp/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-eppsp/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-picketlink-idm/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/jboss-portletbridge/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> <artifactId>mead.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../mead.parent/pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/mead.parent/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/mead.parent/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -6,7 +6,7 @@ <parent> <groupId>org.exoplatform.portal.mead</groupId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <artifactId>mead-tools</artifactId> <relativePath>../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2012-07-02 20:26:51 UTC (rev 8760) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/mead-tools/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -7,7 +7,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>distribution.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <groupId>org.exoplatform.portal.mead</groupId> @@ -55,7 +55,7 @@ </build> <properties> - <gatein.tag>EPP_5_2_1_GA</gatein.tag> + <gatein.tag>EPP_5_2_2_ER01</gatein.tag> <!-- Ant properties --> <ant.build.file>build.xml</ant.build.file> Modified: epp/portal/tags/EPP_5_2_2_ER01/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/distribution/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/extension/config/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/extension/ear/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,17 +38,17 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <scope>provided</scope> <exclusions> <exclusion> @@ -76,7 +76,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <type>war</type> </dependency> <dependency> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/extension/jar/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/extension/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/extension/war/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portal/config/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portal/ear/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portal/jar/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portal/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portal/rest-war/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portal/war/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/api/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/jsfhellouser/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/jsphellouser/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/simplesthelloworld/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/portlets/struts-jpetstore/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/skins/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/examples/skins/simpleskin/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/gadgets/core/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/gadgets/eXoGadgets/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/gadgets/gwtGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/gadgets/gwtGadgets/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -28,7 +28,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.gwtGadgets</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/gadgets/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/gadgets/server/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <packaging>pom</packaging> <name>EPP GateIn - Portal - ${project.version}</name> @@ -80,9 +80,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/ta... - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/port... - <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/EPP_5_2_1_G... + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/ta... + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/port... + <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/EPP_5_2_2_E... </scm> <modules> @@ -469,79 +469,79 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.initializer</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -551,68 +551,68 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <type>test-jar</type> </dependency> <dependency> @@ -629,7 +629,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> <!-- Chromattic --> Modified: epp/portal/tags/EPP_5_2_2_ER01/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/portlet/dashboard/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/portlet/exoadmin/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/portlet/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/portlet/web/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/server/jboss/patch-ear/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/server/jboss/plugin/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/server/jboss/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/server/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/starter/ear/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</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.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/tags/EPP_5_2_2_ER01/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/starter/jar/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/tags/EPP_5_2_2_ER01/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/starter/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/starter/war/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</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.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </dependency> </dependencies> </project> Modified: epp/portal/tags/EPP_5_2_2_ER01/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/testsuite/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/testsuite/selenium-snifftests/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/testsuite/webuibasedsamples/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,495 +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. - */ - -/** - * This class manages the drag and drop of components on the page. - * It uses a DradDrop object to manage the events, sets some callback functions - * and some parameters to initialize the DragDrop object. - */ -function PortalDragDrop() { - this.count = 0 ; -} ; - -/** - * This function inits the PortalDragDrop object - * It initializes a DragDrop object that will manage the drag events - */ - -PortalDragDrop.prototype.init = function(e) { - if (eXo.core.DragDrop.dndEvent){ - return; - } - - if (!e) e = window.event; - if(((e.which) && (e.which == 2 || e.which == 3)) || ((e.button) && (e.button == 2))) return; - - var DOMUtil = eXo.core.DOMUtil ; - var Browser = eXo.core.Browser ; - var DragDrop = eXo.core.DragDrop ; - var Mouse = eXo.core.Mouse; - - var previewBlock = null; - var previewTD = null; - /** - * This function is called after the DragDrop object is initialized - */ - DragDrop.initCallback = function (dndEvent) { - var PortalDragDrop = eXo.portal.PortalDragDrop ; - this.origDragObjectStyle = new eXo.core.HashMap() ; - var dragObject = dndEvent.dragObject ; - var properties = ["top", eXo.core.I18n.isLT() ? "left" : "right", "zIndex", "opacity", "filter", "position"] ; - this.origDragObjectStyle.copyProperties(properties, dragObject.style) ; - - var isAddingNewly = !DOMUtil.findFirstDescendantByClass(dragObject, "div", "UIComponentBlock"); - - var uiWorkingWS = document.getElementById("UIWorkingWorkspace"); - PortalDragDrop.positionRootObj = !isAddingNewly ? uiWorkingWS : - DOMUtil.findFirstDescendantByClass(uiWorkingWS, "div", "UIPortalComposer"); - - var originalDragObjectTop = Browser.findPosYInContainer(dragObject, PortalDragDrop.positionRootObj); - var originalDragObjectLeft = Browser.findPosXInContainer(dragObject, PortalDragDrop.positionRootObj); - PortalDragDrop.deltaYDragObjectAndMouse = Browser.findMouseRelativeY(dragObject, e); - PortalDragDrop.deltaXDragObjectAndMouse = Browser.findMouseRelativeX(dragObject, e); - if(isAddingNewly) { - var contentContainer = DOMUtil.findAncestorByClass(dragObject, "PopupContent"); - originalDragObjectTop -= contentContainer.scrollTop; - PortalDragDrop.deltaYDragObjectAndMouse += contentContainer.scrollTop; - } - - PortalDragDrop.parentDragObject = dragObject.parentNode ; - PortalDragDrop.backupDragObjectWidth = dragObject.offsetWidth ; - - /*Case: dragObject out of UIPortal*/ - - if(isAddingNewly) { - var cloneObject = dragObject.cloneNode(true) ; - dragObject.parentNode.insertBefore(cloneObject, dragObject) ; - cloneObject.style.opacity = 0.5 ; - cloneObject.style.filter = "alpha(opacity=50)" ; - cloneObject.style.width = PortalDragDrop.backupDragObjectWidth + "px" ; - dndEvent.dragObject = cloneObject ; - dndEvent.dragObject.isAddingNewly = isAddingNewly; - } else { - var componentBlockWidth = 300; - - previewBlock = PortalDragDrop.createPreview(); - previewBlock.style.height = dragObject.offsetHeight + "px"; - dragObject.parentNode.insertBefore(previewBlock, dragObject); - dragObject.style.width = componentBlockWidth + "px"; - var componentBlock = eXo.core.DOMUtil.findFirstDescendantByClass(dragObject, "div", "UIComponentBlock") ; - var editBlock = eXo.core.DOMUtil.findFirstChildByClass(componentBlock, "div", "EDITION-BLOCK"); - if(editBlock) { - var newLayer = eXo.core.DOMUtil.findFirstDescendantByClass(editBlock, "div", "NewLayer"); - if(newLayer) newLayer.style.width = "300px"; - } - } - dragObject.isAddingNewly = isAddingNewly; - dragObject = dndEvent.dragObject; - dragObject.style.position = "absolute" ; - dragObject.style.top = originalDragObjectTop + "px" ; - var dragObjectLeft = originalDragObjectLeft; - - if (PortalDragDrop.deltaXDragObjectAndMouse > componentBlockWidth/2) { - if ((PortalDragDrop.backupDragObjectWidth - PortalDragDrop.deltaXDragObjectAndMouse) > componentBlockWidth/2) { - dragObjectLeft = originalDragObjectLeft + PortalDragDrop.deltaXDragObjectAndMouse - componentBlockWidth/2; - } else { - dragObjectLeft = originalDragObjectLeft + PortalDragDrop.backupDragObjectWidth - componentBlockWidth; - } - } - - if (eXo.core.I18n.isLT()) dragObject.style.left = dragObjectLeft + "px"; - else dragObject.style.right = PortalDragDrop.positionRootObj.offsetWidth - dragObject.offsetWidth - dragObjectLeft + "px"; - - eXo.portal.isInDragging = true; - } - - DragDrop.dragCallback = function(dndEvent) { - var dragObject = dndEvent.dragObject ; - /* Control Scroll */ - eXo.portal.PortalDragDrop.scrollOnDrag(dndEvent) ; - if(!dndEvent.foundTargetObject) { - if (!dndEvent.lastFoundTargetObject) { - return; - } else { - dndEvent.foundTargetObject = dndEvent.lastFoundTargetObject; - } - } - - var uiComponentLayout ; - if(dndEvent.foundTargetObject.className == "UIPage") { - uiComponentLayout = DOMUtil.findFirstDescendantByClass(dndEvent.foundTargetObject, "div", "VIEW-PAGE"); - } else if(dndEvent.foundTargetObject.className == "UIPortal") { - if(eXo.portal.portalMode % 2) uiComponentLayout = DOMUtil.findFirstDescendantByClass(dndEvent.foundTargetObject, "div", "LAYOUT-PORTAL") ; - else uiComponentLayout = DOMUtil.findFirstDescendantByClass(dndEvent.foundTargetObject, "div", "VIEW-PORTAL"); - } else { - var foundUIComponent = new eXo.portal.UIPortalComponent(dndEvent.foundTargetObject) ; - if(eXo.portal.portalMode % 2) uiComponentLayout = foundUIComponent.getLayoutBlock() ; - else uiComponentLayout = foundUIComponent.getViewBlock(); - uiComponentLayout.style.height = "auto"; - } - - dndEvent.foundTargetObject.uiComponentLayoutType = uiComponentLayout ; - var componentIdElement = DOMUtil.getChildrenByTagName(uiComponentLayout, "div")[0] ; - var layoutTypeElement = DOMUtil.getChildrenByTagName(componentIdElement, "div")[0] ; - eXo.portal.PortalDragDrop.layoutTypeElementNode = layoutTypeElement ; - - if(previewBlock == null) previewBlock = eXo.portal.PortalDragDrop.createPreview(); - if(previewTD || document.getElementById("PreviewTDBlock")) { - if(!previewTD) previewTD = document.getElementById("PreviewTDBlock"); - if(previewTD.parentNode) previewTD.parentNode.removeChild(previewTD); - previewTD = null; - } - - if(layoutTypeElement != null && !DOMUtil.hasClass(layoutTypeElement, "UITableColumnContainer")) { - /* ===============================CASE ROW LAYOUT================================ */ - var rowContainer = DOMUtil.findFirstDescendantByClass(uiComponentLayout, "div", "UIRowContainer") ; - var childRowContainer = DOMUtil.getChildrenByTagName(rowContainer, "div") ; - - var listComponent = new Array() ; - for(var i = 0; i < childRowContainer.length; i++) { - if((childRowContainer[i].className != "DragAndDropPreview") && (childRowContainer[i] != dragObject)) { - listComponent.push(childRowContainer[i]) ; - } - } - - dndEvent.foundTargetObject.listComponentInTarget = listComponent ; - var insertPosition = eXo.portal.PortalDragDrop.findInsertPosition(listComponent, "row", dndEvent.backupMouseEvent) ; - dndEvent.foundTargetObject.foundIndex = insertPosition ; - - /* Insert preview block */ - if(insertPosition >= 0) { - rowContainer.insertBefore(previewBlock, listComponent[insertPosition]) ; - } else { - rowContainer.appendChild(previewBlock) ; - } - } else { - /* ===============================CASE COLUMN LAYOUT================================ */ - var columnContainer = DOMUtil.findFirstDescendantByClass(uiComponentLayout, "table", "UITableColumnContainer") ; - var trContainer = DOMUtil.findFirstDescendantByClass(uiComponentLayout, "tr", "TRContainer") ; - var tdElementList = DOMUtil.getChildrenByTagName(trContainer, "td") ; - - var listComponent = new Array() ; - for(var i = 0; i < tdElementList.length; i++) { - if(DOMUtil.hasAncestor(previewBlock, uiComponentLayout)) { - var td = tdElementList[i]; - if((td != previewBlock.parentNode) && (td != dragObject.parentNode)) { - listComponent.push(td) ; - } else if(td == dragObject.parentNode) { - td.style.width = "0px"; - } - } else { - listComponent.push(tdElementList[i]) ; - } - } - - dndEvent.foundTargetObject.listComponentInTarget = listComponent ; - var insertPosition = eXo.portal.PortalDragDrop.findInsertPosition(listComponent, "column", dndEvent.backupMouseEvent) ; - dndEvent.foundTargetObject.foundIndex = insertPosition ; - - /* Insert preview block */ - previewTD = document.createElement("td"); - previewTD.id = previewTD.className = "PreviewTDBlock"; - previewTD.appendChild(previewBlock); - if(insertPosition >= 0) { - trContainer.insertBefore(previewTD, listComponent[insertPosition]) ; - } else { - trContainer.appendChild(previewTD) ; - } - } - } ; - - DragDrop.dropCallback = function(dndEvent) { - this.origDragObjectStyle.setProperties(dndEvent.dragObject.style, false) ; - - var hasChanged = true; - //When press esc key, we want to cancel the dragdrop, but now it only works with FF - if (dndEvent.backupMouseEvent && dndEvent.backupMouseEvent.keyCode == 27 && eXo.core.Browser.isFF()) { - hasChanged = false; - } - //When dragObject is outside - if (!dndEvent.foundTargetObject) { - dndEvent.foundTargetObject = dndEvent.lastFoundTargetObject; - } - - var targetElement = dndEvent.foundTargetObject; - if(!targetElement || targetElement.foundIndex == null) { - hasChanged = false; - } - //When dragobject is next to preview object (position is not changed) - if(!dndEvent.dragObject.isAddingNewly) { - var DOMUtil = eXo.core.DOMUtil; - var previewClass = "DragAndDropPreview"; - var previewTagName = "div"; - var previewSibling = dndEvent.dragObject; - if (dndEvent.dragObject.parentNode.tagName.toLowerCase() == "td") { - previewSibling = dndEvent.dragObject.parentNode; - previewClass = "PreviewTDBlock"; - previewTagName = "td"; - } - var tempObj = DOMUtil.findNextElementByTagName(previewSibling, previewTagName); - if (tempObj != null && tempObj.className == previewClass) { - hasChanged = false; - } else { - tempObj = DOMUtil.findPreviousElementByTagName(previewSibling, previewTagName); - if (tempObj != null && tempObj.className == previewClass) { - hasChanged = false; - } - } - } - - if(dndEvent.backupMouseEvent && dndEvent.backupMouseEvent.keyCode != 27) { - eXo.portal.PortalDragDrop.doDropCallback(dndEvent) ; - } else { - if(dndEvent.dragObject.parentNode.nodeName.toLowerCase() == "td") { - dndEvent.dragObject.parentNode.style.width = "auto"; - } - if(dndEvent.dragObject.isAddingNewly) { - dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ; - } - } - - if(!dndEvent.dragObject.isAddingNewly) { - var componentBlock = eXo.core.DOMUtil.findFirstDescendantByClass(dndEvent.dragObject, "div", "UIComponentBlock") ; - var editBlock = eXo.core.DOMUtil.findFirstChildByClass(componentBlock, "div", "EDITION-BLOCK"); - if(editBlock) editBlock.style.display = "none"; - } - - if(previewBlock) previewBlock.parentNode.removeChild(previewBlock); - if(previewTD) previewTD.parentNode.removeChild(previewTD); - previewBlock = previewTD = null; - - eXo.portal.isInDragging = false; - if (hasChanged) { - eXo.portal.UIPortal.changeComposerSaveButton(); - } - // fix bug WEBOS-196 - dndEvent.dragObject.style.width = "auto" ; - }; - - var clickObject = this; - var componentBlock = DOMUtil.findAncestorByClass(clickObject, "UIComponentBlock") ; - - //Check if it is dragging the object existing in the current layout or from the popup composer to add newly - if(componentBlock != null) { - var dragBlock = eXo.portal.UIPortal.findUIComponentOf(componentBlock) ; - DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, dragBlock, e) ; - } else { - var dragBlock = DOMUtil.findAncestorByClass(clickObject, "DragObjectPortlet") ; - //TODO: Seems the dragBlock is always null - if(dragBlock) { - eXo.debug("The dragBlock is not null"); - DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, dragBlock, e) ; - } else { - DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, clickObject, e) ; - } - } -}; - -/** - * Perform following works after dropping : - * - * 1. Remove the dragging object if any - * 2. Send an request to server side to update the changes - */ -PortalDragDrop.prototype.doDropCallback = function(dndEvent) { - var srcElement = dndEvent.dragObject ; - var targetElement = dndEvent.foundTargetObject; - - if(!targetElement || targetElement.foundIndex == null) { - if(dndEvent.dragObject.isAddingNewly) { - dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ; - } - dndEvent.dragObject.style.width = "auto"; - return; - } - - if(!srcElement.isAddingNewly && (targetElement.foundIndex != null)) { - if(eXo.portal.PortalDragDrop.layoutTypeElementNode != null) { - eXo.portal.PortalDragDrop.divRowContainerAddChild(srcElement, targetElement, targetElement.foundIndex) ; - } else { - eXo.portal.PortalDragDrop.parentDragObject.style.width = "auto"; - eXo.portal.PortalDragDrop.tableColumnContainerAddChild(srcElement, targetElement, targetElement.foundIndex) ; - } - } - - if(srcElement.isAddingNewly) { - eXo.core.DOMUtil.removeElement(srcElement) ; - } - - var params = [ - {name: "srcID", value: (srcElement.id.replace(/^UIPortlet-/, ""))}, - {name: "targetID", value: targetElement.id.replace(/^.*-/, "")}, - {name: "insertPosition", value: targetElement.foundIndex}, - {name: "isAddingNewly", value: srcElement.isAddingNewly} - ] ; - - try { - dndEvent.lastFoundTargetObject.foundIndex = null; - } catch(err) { - - } - // Modified by Philippe : added callback function - ajaxGet(eXo.env.server.createPortalURL("UIPortal", "MoveChild", true, params)) ; -}; - -/** - * Return an array of droppable target objects - * - * @param the dragging object - */ -PortalDragDrop.prototype.findDropableTargets = function(dragBlock) { - var DOMUtil = eXo.core.DOMUtil; - var dropableTargets = new Array() ; - - if (dragBlock && DOMUtil.hasClass(dragBlock, "UIColumnContainer")) { - var uiTableContainer = eXo.core.DOMUtil.findAncestorByClass(dragBlock, "UITableColumnContainer"); - dropableTargets.push(uiTableContainer); - return dropableTargets; - } - var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; - var pagebody = document.getElementById("UIPageBody"); - if(eXo.portal.portalMode && pagebody) { - var uiPortal = DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPortal") ; - dropableTargets.push(uiPortal) ; - } else { - var uiPage = DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPage") ; - if(uiPage) dropableTargets.push(uiPage) ; - } - - var uiContainers = DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIContainer") ; - for(var i = 0; i < uiContainers.length; i++) { - if(DOMUtil.hasAncestor(uiContainers[i], dragBlock)) continue; - if(DOMUtil.hasClass(uiContainers[i], "ProtectedContainer")) continue; - if (DOMUtil.hasClass(uiContainers[i], "UITableColumnContainer")) continue; - dropableTargets.push(uiContainers[i]) ; - } - return dropableTargets ; -}; - -PortalDragDrop.prototype.scrollOnDrag = function(dndEvent) { - var workspaceHeight = document.getElementById("UIWorkingWorkspace").offsetHeight; - var browserHeight = eXo.core.Browser.getBrowserHeight() ; - if(workspaceHeight <= browserHeight) return; - var mouseY = eXo.core.Browser.findMouseYInClient(dndEvent.backupMouseEvent) ; - var deltaTop = mouseY - (Math.round(browserHeight * 5/6)) ; - var deltaBottom = mouseY - (Math.round(browserHeight/6)) ; - var currentDragObjPos = parseInt(dndEvent.dragObject.style.top); - if(deltaTop > 0) { - document.documentElement.scrollTop += deltaTop - 5; - currentDragObjPos += deltaTop - 5; - } - - if(deltaBottom < 0 && document.documentElement.scrollTop > 0) { - document.documentElement.scrollTop += deltaBottom ; - currentDragObjPos += deltaBottom; - } - - dndEvent.dragObject.style.top = currentDragObjPos + "px"; -}; - -/** - * Return a most suiable position among the <code>components</code> objects - * that the dragging object should be at - * - * @param layout {string} the layout type which is "row" or "column" - */ -PortalDragDrop.prototype.findInsertPosition = function(components, layout, mouseEvent) { - var Browser = eXo.core.Browser; - if (layout == "row") { - for (var i = 0; i < components.length; i++) { - var componentTop = Browser.findPosY(components[i]); - var mouseYInPage = Browser.findMouseYInPage(mouseEvent); - var componentMIddle = componentTop + Math.round(components[i].offsetHeight / 2); - if (mouseYInPage > componentMIddle) continue; - else return i; - } - - return -1; - } else { - for (var i = 0; i < components.length; i++) { - var mouseXInPage = Browser.findMouseXInPage(mouseEvent); - var componentX = Browser.findPosX(components[i], eXo.core.I18n.isRT()); - if (eXo.core.I18n.isRT()) { - if (mouseXInPage < componentX) continue; - } else if (mouseXInPage > componentX ) continue; - - return i; - } - - return -1; - } - }; - -/** - * Create a div block which show the preview block - */ -PortalDragDrop.prototype.createPreview = function(layoutType) { - var previewBlock = document.createElement("div") ; - previewBlock.className = "DragAndDropPreview" ; - previewBlock.id = "DragAndDropPreview" ; - return previewBlock; -}; - -/** - * Add the <code>srcElement</code> dragging object to a container. - * If the dragging object is a column then let remove it from the table column container - */ -PortalDragDrop.prototype.divRowContainerAddChild = function(srcElement, targetElement, insertPosition) { - var listComponent = eXo.core.DragDrop.dndEvent.foundTargetObject.listComponentInTarget ; - var uiRowContainer = eXo.core.DOMUtil.findFirstDescendantByClass(targetElement, "div", "UIRowContainer") ; - srcElement.style.width = "auto" ; - - var parentNode = srcElement.parentNode; - if(insertPosition >= 0) { - uiRowContainer.insertBefore(srcElement, listComponent[insertPosition]) ; - } else { - uiRowContainer.appendChild(srcElement) ; - } - - if(parentNode.nodeName.toLowerCase() == "td") { - eXo.core.DOMUtil.removeElement(parentNode) ; - } -}; - -/** - * Add the <code>srcElement</code> to be a column of the <code>targetElement</code> table column container - * at the position <code>insertPosition</code> - */ -PortalDragDrop.prototype.tableColumnContainerAddChild = function(srcElement, targetElement, insertPosition) { - var listComponent = eXo.core.DragDrop.dndEvent.foundTargetObject.listComponentInTarget ; - var DOMUtil = eXo.core.DOMUtil ; - var trContainer = DOMUtil.findFirstDescendantByClass(targetElement, "tr", "TRContainer") ; - - var tdInserted = document.createElement('td') ; - tdInserted.appendChild(srcElement) ; - - if(insertPosition >= 0) { - trContainer.insertBefore(tdInserted, listComponent[insertPosition]) ; - } else { - trContainer.appendChild(tdInserted) ; - } - - srcElement.style.width = "auto" ; - - if(eXo.portal.PortalDragDrop.parentDragObject.nodeName.toLowerCase() == "td") { - DOMUtil.removeElement(eXo.portal.PortalDragDrop.parentDragObject) ; - } -}; - -eXo.portal.PortalDragDrop = new PortalDragDrop() ; Copied: epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js (from rev 8764, epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,489 @@ +/** + * 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. + */ + +/** + * This class manages the drag and drop of components on the page. + * It uses a DradDrop object to manage the events, sets some callback functions + * and some parameters to initialize the DragDrop object. + */ +function PortalDragDrop() { + this.count = 0 ; +} ; + +/** + * This function inits the PortalDragDrop object + * It initializes a DragDrop object that will manage the drag events + */ + +PortalDragDrop.prototype.init = function(e) { + if (eXo.core.DragDrop.dndEvent){ + return; + } + + if (!e) e = window.event; + if(((e.which) && (e.which == 2 || e.which == 3)) || ((e.button) && (e.button == 2))) return; + + var DOMUtil = eXo.core.DOMUtil ; + var Browser = eXo.core.Browser ; + var DragDrop = eXo.core.DragDrop ; + var Mouse = eXo.core.Mouse; + + var previewBlock = null; + var previewTD = null; + /** + * This function is called after the DragDrop object is initialized + */ + DragDrop.initCallback = function (dndEvent) { + var PortalDragDrop = eXo.portal.PortalDragDrop ; + this.origDragObjectStyle = new eXo.core.HashMap() ; + var dragObject = dndEvent.dragObject ; + var properties = ["top", eXo.core.I18n.isLT() ? "left" : "right", "zIndex", "opacity", "filter", "position"] ; + this.origDragObjectStyle.copyProperties(properties, dragObject.style) ; + + var isAddingNewly = !DOMUtil.findFirstDescendantByClass(dragObject, "div", "UIComponentBlock"); + + var uiWorkingWS = document.getElementById("UIWorkingWorkspace"); + PortalDragDrop.positionRootObj = !isAddingNewly ? uiWorkingWS : + DOMUtil.findFirstDescendantByClass(uiWorkingWS, "div", "UIPortalComposer"); + + var originalDragObjectTop = Browser.findPosYInContainer(dragObject, PortalDragDrop.positionRootObj); + var originalDragObjectLeft = Browser.findPosXInContainer(dragObject, PortalDragDrop.positionRootObj); + PortalDragDrop.deltaYDragObjectAndMouse = Browser.findMouseRelativeY(dragObject, e); + PortalDragDrop.deltaXDragObjectAndMouse = Browser.findMouseRelativeX(dragObject, e); + if(isAddingNewly) { + var contentContainer = DOMUtil.findAncestorByClass(dragObject, "PopupContent"); + originalDragObjectTop -= contentContainer.scrollTop; + PortalDragDrop.deltaYDragObjectAndMouse += contentContainer.scrollTop; + } + + PortalDragDrop.parentDragObject = dragObject.parentNode ; + PortalDragDrop.backupDragObjectWidth = dragObject.offsetWidth ; + + /*Case: dragObject out of UIPortal*/ + + if(isAddingNewly) { + var cloneObject = dragObject.cloneNode(true) ; + dragObject.parentNode.insertBefore(cloneObject, dragObject) ; + cloneObject.style.opacity = 0.5 ; + cloneObject.style.filter = "alpha(opacity=50)" ; + cloneObject.style.width = PortalDragDrop.backupDragObjectWidth + "px" ; + dndEvent.dragObject = cloneObject ; + dndEvent.dragObject.isAddingNewly = isAddingNewly; + } else { + var componentBlockWidth = 300; + + previewBlock = PortalDragDrop.createPreview(); + previewBlock.style.height = dragObject.offsetHeight + "px"; + dragObject.parentNode.insertBefore(previewBlock, dragObject); + dragObject.style.width = componentBlockWidth + "px"; + var componentBlock = eXo.core.DOMUtil.findFirstDescendantByClass(dragObject, "div", "UIComponentBlock") ; + var editBlock = eXo.core.DOMUtil.findFirstChildByClass(componentBlock, "div", "EDITION-BLOCK"); + if(editBlock) { + var newLayer = eXo.core.DOMUtil.findFirstDescendantByClass(editBlock, "div", "NewLayer"); + if(newLayer) newLayer.style.width = "300px"; + } + } + dragObject.isAddingNewly = isAddingNewly; + dragObject = dndEvent.dragObject; + dragObject.style.position = "absolute" ; + dragObject.style.top = originalDragObjectTop + "px" ; + var dragObjectLeft = originalDragObjectLeft; + + if (PortalDragDrop.deltaXDragObjectAndMouse > componentBlockWidth/2) { + if ((PortalDragDrop.backupDragObjectWidth - PortalDragDrop.deltaXDragObjectAndMouse) > componentBlockWidth/2) { + dragObjectLeft = originalDragObjectLeft + PortalDragDrop.deltaXDragObjectAndMouse - componentBlockWidth/2; + } else { + dragObjectLeft = originalDragObjectLeft + PortalDragDrop.backupDragObjectWidth - componentBlockWidth; + } + } + + if (eXo.core.I18n.isLT()) dragObject.style.left = dragObjectLeft + "px"; + else dragObject.style.right = PortalDragDrop.positionRootObj.offsetWidth - dragObject.offsetWidth - dragObjectLeft + "px"; + + eXo.portal.isInDragging = true; + } + + DragDrop.dragCallback = function(dndEvent) { + var dragObject = dndEvent.dragObject ; + /* Control Scroll */ + eXo.portal.PortalDragDrop.scrollOnDrag(dndEvent) ; + if(!dndEvent.foundTargetObject) { + if (!dndEvent.lastFoundTargetObject) { + return; + } else { + dndEvent.foundTargetObject = dndEvent.lastFoundTargetObject; + } + } + + var uiComponentLayout ; + if(dndEvent.foundTargetObject.className == "UIPage") { + uiComponentLayout = DOMUtil.findFirstDescendantByClass(dndEvent.foundTargetObject, "div", "VIEW-PAGE"); + } else if(dndEvent.foundTargetObject.className == "UIPortal") { + if(eXo.portal.portalMode % 2) uiComponentLayout = DOMUtil.findFirstDescendantByClass(dndEvent.foundTargetObject, "div", "LAYOUT-PORTAL") ; + else uiComponentLayout = DOMUtil.findFirstDescendantByClass(dndEvent.foundTargetObject, "div", "VIEW-PORTAL"); + } else { + var foundUIComponent = new eXo.portal.UIPortalComponent(dndEvent.foundTargetObject) ; + if(eXo.portal.portalMode % 2) uiComponentLayout = foundUIComponent.getLayoutBlock() ; + else uiComponentLayout = foundUIComponent.getViewBlock(); + uiComponentLayout.style.height = "auto"; + } + + dndEvent.foundTargetObject.uiComponentLayoutType = uiComponentLayout ; + var componentIdElement = DOMUtil.getChildrenByTagName(uiComponentLayout, "div")[0] ; + var layoutTypeElement = DOMUtil.getChildrenByTagName(componentIdElement, "div")[0] ; + eXo.portal.PortalDragDrop.layoutTypeElementNode = layoutTypeElement ; + + if(previewBlock == null) previewBlock = eXo.portal.PortalDragDrop.createPreview(); + if(previewTD || document.getElementById("PreviewTDBlock")) { + if(!previewTD) previewTD = document.getElementById("PreviewTDBlock"); + if(previewTD.parentNode) previewTD.parentNode.removeChild(previewTD); + previewTD = null; + } + + if(layoutTypeElement != null && !DOMUtil.hasClass(layoutTypeElement, "UITableColumnContainer")) { + /* ===============================CASE ROW LAYOUT================================ */ + var rowContainer = DOMUtil.findFirstDescendantByClass(uiComponentLayout, "div", "UIRowContainer") ; + var childRowContainer = DOMUtil.getChildrenByTagName(rowContainer, "div") ; + + var listComponent = new Array() ; + for(var i = 0; i < childRowContainer.length; i++) { + if((childRowContainer[i].className != "DragAndDropPreview") && (childRowContainer[i] != dragObject)) { + listComponent.push(childRowContainer[i]) ; + } + } + + dndEvent.foundTargetObject.listComponentInTarget = listComponent ; + var insertPosition = eXo.portal.PortalDragDrop.findInsertPosition(listComponent, "row", dndEvent.backupMouseEvent) ; + dndEvent.foundTargetObject.foundIndex = insertPosition ; + + /* Insert preview block */ + if(insertPosition >= 0) { + rowContainer.insertBefore(previewBlock, listComponent[insertPosition]) ; + } else { + rowContainer.appendChild(previewBlock) ; + } + } else { + /* ===============================CASE COLUMN LAYOUT================================ */ + var columnContainer = DOMUtil.findFirstDescendantByClass(uiComponentLayout, "table", "UITableColumnContainer") ; + var trContainer = DOMUtil.findFirstDescendantByClass(uiComponentLayout, "tr", "TRContainer") ; + var tdElementList = DOMUtil.getChildrenByTagName(trContainer, "td") ; + + var listComponent = new Array() ; + for(var i = 0; i < tdElementList.length; i++) { + if(DOMUtil.hasAncestor(previewBlock, uiComponentLayout)) { + var td = tdElementList[i]; + if((td != previewBlock.parentNode) && (td != dragObject.parentNode)) { + listComponent.push(td) ; + } else if(td == dragObject.parentNode) { + td.style.width = "0px"; + } + } else { + listComponent.push(tdElementList[i]) ; + } + } + + dndEvent.foundTargetObject.listComponentInTarget = listComponent ; + var insertPosition = eXo.portal.PortalDragDrop.findInsertPosition(listComponent, "column", dndEvent.backupMouseEvent) ; + dndEvent.foundTargetObject.foundIndex = insertPosition ; + + /* Insert preview block */ + previewTD = document.createElement("td"); + previewTD.id = previewTD.className = "PreviewTDBlock"; + previewTD.appendChild(previewBlock); + if(insertPosition >= 0) { + trContainer.insertBefore(previewTD, listComponent[insertPosition]) ; + } else { + trContainer.appendChild(previewTD) ; + } + } + } ; + + DragDrop.dropCallback = function(dndEvent) { + this.origDragObjectStyle.setProperties(dndEvent.dragObject.style, false) ; + + var hasChanged = true; + //When press esc key, we want to cancel the dragdrop, but now it only works with FF + if (dndEvent.backupMouseEvent && dndEvent.backupMouseEvent.keyCode == 27 && eXo.core.Browser.isFF()) { + hasChanged = false; + } + //When dragObject is outside + if (!dndEvent.foundTargetObject) { + dndEvent.foundTargetObject = dndEvent.lastFoundTargetObject; + } + + var targetElement = dndEvent.foundTargetObject; + if(!targetElement || targetElement.foundIndex == null) { + hasChanged = false; + } + //When dragobject is next to preview object (position is not changed) + if(!dndEvent.dragObject.isAddingNewly) { + var DOMUtil = eXo.core.DOMUtil; + var previewClass = "DragAndDropPreview"; + var previewTagName = "div"; + var previewSibling = dndEvent.dragObject; + if (dndEvent.dragObject.parentNode.tagName.toLowerCase() == "td") { + previewSibling = dndEvent.dragObject.parentNode; + previewClass = "PreviewTDBlock"; + previewTagName = "td"; + } + var tempObj = DOMUtil.findNextElementByTagName(previewSibling, previewTagName); + if (tempObj != null && tempObj.className == previewClass) { + hasChanged = false; + } else { + tempObj = DOMUtil.findPreviousElementByTagName(previewSibling, previewTagName); + if (tempObj != null && tempObj.className == previewClass) { + hasChanged = false; + } + } + } + + if(dndEvent.backupMouseEvent && dndEvent.backupMouseEvent.keyCode != 27) { + eXo.portal.PortalDragDrop.doDropCallback(dndEvent) ; + } else { + if(dndEvent.dragObject.parentNode.nodeName.toLowerCase() == "td") { + dndEvent.dragObject.parentNode.style.width = "auto"; + } + if(dndEvent.dragObject.isAddingNewly) { + dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ; + } + } + + if(!dndEvent.dragObject.isAddingNewly) { + var componentBlock = eXo.core.DOMUtil.findFirstDescendantByClass(dndEvent.dragObject, "div", "UIComponentBlock") ; + var editBlock = eXo.core.DOMUtil.findFirstChildByClass(componentBlock, "div", "EDITION-BLOCK"); + if(editBlock) editBlock.style.display = "none"; + } + + if(previewBlock) previewBlock.parentNode.removeChild(previewBlock); + if(previewTD) previewTD.parentNode.removeChild(previewTD); + previewBlock = previewTD = null; + + eXo.portal.isInDragging = false; + if (hasChanged) { + eXo.portal.UIPortal.changeComposerSaveButton(); + } + // fix bug WEBOS-196 + dndEvent.dragObject.style.width = "auto" ; + }; + + var clickObject = this; + var componentBlock = DOMUtil.findAncestorByClass(clickObject, "UIComponentBlock") ; + + //Check if it is dragging the object existing in the current layout or from the popup composer to add newly + if(componentBlock != null) { + var dragBlock = eXo.portal.UIPortal.findUIComponentOf(componentBlock) ; + DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, dragBlock, e) ; + } else { + var dragBlock = DOMUtil.findAncestorByClass(clickObject, "DragObjectPortlet") ; + //TODO: Seems the dragBlock is always null + if(dragBlock) { + eXo.debug("The dragBlock is not null"); + DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, dragBlock, e) ; + } else { + DragDrop.init(eXo.portal.PortalDragDrop.findDropableTargets(dragBlock), clickObject, clickObject, e) ; + } + } +}; + +/** + * Perform following works after dropping : + * + * 1. Remove the dragging object if any + * 2. Send an request to server side to update the changes + */ +PortalDragDrop.prototype.doDropCallback = function(dndEvent) { + var srcElement = dndEvent.dragObject ; + var targetElement = dndEvent.foundTargetObject; + + if(!targetElement || targetElement.foundIndex == null) { + if(dndEvent.dragObject.isAddingNewly) { + dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ; + } + dndEvent.dragObject.style.width = "auto"; + return; + } + + if(!srcElement.isAddingNewly && (targetElement.foundIndex != null)) { + if(eXo.portal.PortalDragDrop.layoutTypeElementNode != null) { + eXo.portal.PortalDragDrop.divRowContainerAddChild(srcElement, targetElement, targetElement.foundIndex) ; + } else { + eXo.portal.PortalDragDrop.parentDragObject.style.width = "auto"; + eXo.portal.PortalDragDrop.tableColumnContainerAddChild(srcElement, targetElement, targetElement.foundIndex) ; + } + } + + if(srcElement.isAddingNewly) { + eXo.core.DOMUtil.removeElement(srcElement) ; + } + + var params = [ + {name: "srcID", value: (srcElement.id.replace(/^UIPortlet-/, ""))}, + {name: "targetID", value: targetElement.id.replace(/^.*-/, "")}, + {name: "insertPosition", value: targetElement.foundIndex}, + {name: "isAddingNewly", value: srcElement.isAddingNewly} + ] ; + + try { + dndEvent.lastFoundTargetObject.foundIndex = null; + } catch(err) { + + } + // Modified by Philippe : added callback function + ajaxGet(eXo.env.server.createPortalURL("UIPortal", "MoveChild", true, params)) ; +}; + +/** + * Return an array of droppable target objects + * + * @param the dragging object + */ +PortalDragDrop.prototype.findDropableTargets = function(dragBlock) { + var DOMUtil = eXo.core.DOMUtil; + var dropableTargets = new Array() ; + var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; + + var pagebody = document.getElementById("UIPageBody"); + if(eXo.portal.portalMode && pagebody) { + var uiPortal = DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPortal") ; + dropableTargets.push(uiPortal) ; + } else { + var uiPage = DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPage") ; + if(uiPage) dropableTargets.push(uiPage) ; + } + + var uiContainers = DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIContainer") ; + for(var i = 0; i < uiContainers.length; i++) { + if(DOMUtil.hasAncestor(uiContainers[i], dragBlock)) continue; + if(DOMUtil.hasClass(uiContainers[i], "ProtectedContainer")) continue; + dropableTargets.push(uiContainers[i]) ; + } + return dropableTargets ; +}; + +PortalDragDrop.prototype.scrollOnDrag = function(dndEvent) { + var workspaceHeight = document.getElementById("UIWorkingWorkspace").offsetHeight; + var browserHeight = eXo.core.Browser.getBrowserHeight() ; + if(workspaceHeight <= browserHeight) return; + var mouseY = eXo.core.Browser.findMouseYInClient(dndEvent.backupMouseEvent) ; + var deltaTop = mouseY - (Math.round(browserHeight * 5/6)) ; + var deltaBottom = mouseY - (Math.round(browserHeight/6)) ; + var currentDragObjPos = parseInt(dndEvent.dragObject.style.top); + if(deltaTop > 0) { + document.documentElement.scrollTop += deltaTop - 5; + currentDragObjPos += deltaTop - 5; + } + + if(deltaBottom < 0 && document.documentElement.scrollTop > 0) { + document.documentElement.scrollTop += deltaBottom ; + currentDragObjPos += deltaBottom; + } + + dndEvent.dragObject.style.top = currentDragObjPos + "px"; +}; + +/** + * Return a most suiable position among the <code>components</code> objects + * that the dragging object should be at + * + * @param layout {string} the layout type which is "row" or "column" + */ +PortalDragDrop.prototype.findInsertPosition = function(components, layout, mouseEvent) { + var Browser = eXo.core.Browser; + if (layout == "row") { + for (var i = 0; i < components.length; i++) { + var componentTop = Browser.findPosY(components[i]); + var mouseYInPage = Browser.findMouseYInPage(mouseEvent); + var componentMIddle = componentTop + Math.round(components[i].offsetHeight / 2); + if (mouseYInPage > componentMIddle) continue; + else return i; + } + + return -1; + } else { + for (var i = 0; i < components.length; i++) { + var mouseXInPage = Browser.findMouseXInPage(mouseEvent); + var componentX = Browser.findPosX(components[i], eXo.core.I18n.isRT()); + if (eXo.core.I18n.isRT()) { + if (mouseXInPage < componentX) continue; + } else if (mouseXInPage > componentX ) continue; + + return i; + } + + return -1; + } + }; + +/** + * Create a div block which show the preview block + */ +PortalDragDrop.prototype.createPreview = function(layoutType) { + var previewBlock = document.createElement("div") ; + previewBlock.className = "DragAndDropPreview" ; + previewBlock.id = "DragAndDropPreview" ; + return previewBlock; +}; + +/** + * Add the <code>srcElement</code> dragging object to a container. + * If the dragging object is a column then let remove it from the table column container + */ +PortalDragDrop.prototype.divRowContainerAddChild = function(srcElement, targetElement, insertPosition) { + var listComponent = eXo.core.DragDrop.dndEvent.foundTargetObject.listComponentInTarget ; + var uiRowContainer = eXo.core.DOMUtil.findFirstDescendantByClass(targetElement, "div", "UIRowContainer") ; + srcElement.style.width = "auto" ; + + var parentNode = srcElement.parentNode; + if(insertPosition >= 0) { + uiRowContainer.insertBefore(srcElement, listComponent[insertPosition]) ; + } else { + uiRowContainer.appendChild(srcElement) ; + } + + if(parentNode.nodeName.toLowerCase() == "td") { + eXo.core.DOMUtil.removeElement(parentNode) ; + } +}; + +/** + * Add the <code>srcElement</code> to be a column of the <code>targetElement</code> table column container + * at the position <code>insertPosition</code> + */ +PortalDragDrop.prototype.tableColumnContainerAddChild = function(srcElement, targetElement, insertPosition) { + var listComponent = eXo.core.DragDrop.dndEvent.foundTargetObject.listComponentInTarget ; + var DOMUtil = eXo.core.DOMUtil ; + var trContainer = DOMUtil.findFirstDescendantByClass(targetElement, "tr", "TRContainer") ; + + var tdInserted = document.createElement('td') ; + tdInserted.appendChild(srcElement) ; + + if(insertPosition >= 0) { + trContainer.insertBefore(tdInserted, listComponent[insertPosition]) ; + } else { + trContainer.appendChild(tdInserted) ; + } + + srcElement.style.width = "auto" ; + + if(eXo.portal.PortalDragDrop.parentDragObject.nodeName.toLowerCase() == "td") { + DOMUtil.removeElement(eXo.portal.PortalDragDrop.parentDragObject) ; + } +}; + +eXo.portal.PortalDragDrop = new PortalDragDrop() ; \ No newline at end of file Deleted: epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,674 +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. - */ - -function UIComponent(node) { - if(!node) return null; - this.node = node ; - this.type = node.className ; - var DOMUtil = eXo.core.DOMUtil; - var componentBlock = DOMUtil.findFirstDescendantByClass(node, "div", "UIComponentBlock"); - var children = DOMUtil.getChildrenByTagName(componentBlock, "div") ; - - for(var i=0; i<children.length; i++) { - if(DOMUtil.hasClass(children[i], "LAYOUT-BLOCK")) this.layout = children[i]; - else if(DOMUtil.hasClass(children[i], "VIEW-BLOCK")) this.view = children[i]; - else if(DOMUtil.hasClass(children[i], "EDITION-BLOCK")) this.control = children[i]; - } - - this.component = ""; - - if(DOMUtil.hasClass(node, "UIPortal")) this.id = node.id.replace("UIPortal-", ""); - else if(DOMUtil.hasClass(node, "UIPortlet")) this.id = node.id.replace("UIPortlet-", ""); - else if(DOMUtil.hasClass(node, "UIContainer")) this.id = node.id.replace("UIContainer-", ""); - else this.id = node.id; - -}; - -UIComponent.prototype.getId = function() { return this.id ; }; -UIComponent.prototype.getElement = function() { return this.node ; }; -UIComponent.prototype.getUIComponentType = function() { return this.type ; }; - -UIComponent.prototype.getUIComponentBlock = function() { return this.node ; }; -UIComponent.prototype.getControlBlock = function() { return this.control ; }; -UIComponent.prototype.getLayoutBlock = function() { return this.layout ; }; -UIComponent.prototype.getViewBlock = function() { return this.view ; }; - -/*******************************************************************************/ - -function UIPortal() { - this.portalUIComponentDragDrop = false; -}; - -UIPortal.prototype.blockOnMouseOver = function(event, portlet, isOver) { - var DOMUtil = eXo.core.DOMUtil; - if(!eXo.portal.portalMode || eXo.portal.isInDragging) return; - if(eXo.portal.portalMode <= 2 && DOMUtil.hasClass(portlet, "UIContainer")) return; - if(eXo.portal.portalMode > 2 && eXo.portal.portalMode != 4 && DOMUtil.hasClass(portlet, "UIPortlet")) return; - - if(!event) event = window.event; - event.cancelBubble = true; - - var component = DOMUtil.findFirstDescendantByClass(portlet, "div", "UIComponentBlock"); - var children = DOMUtil.getChildrenByTagName(component, "div"); - var layoutBlock; - var viewBlock; - var editBlock; - - for(var i=0; i<children.length; i++) { - if(DOMUtil.hasClass(children[i], "LAYOUT-BLOCK")) layoutBlock = children[i]; - else if(DOMUtil.hasClass(children[i], "VIEW-BLOCK")) viewBlock = children[i]; - else if(DOMUtil.hasClass(children[i], "EDITION-BLOCK")) editBlock = children[i]; - } - - if(!editBlock) return; - if(isOver) { - var newLayer = DOMUtil.findFirstDescendantByClass(editBlock, "div", "NewLayer"); - var height = 0; var width = 0; - if(layoutBlock && layoutBlock.style.display != "none") { - height = layoutBlock.offsetHeight; - width = layoutBlock.offsetWidth; - } else if(viewBlock && viewBlock.style.display != "none") { - height = viewBlock.offsetHeight; - width = viewBlock.offsetWidth; - } - - if(DOMUtil.hasClass(portlet, "UIPortlet")) { - newLayer.style.width = width + "px"; - newLayer.style.height = height + "px"; - } else { - newLayer.parentNode.style.width = width + "px"; - var normalBlock = DOMUtil.findFirstChildByClass(portlet, "div", "NormalContainerBlock"); - if(normalBlock) DOMUtil.replaceClass(normalBlock, "NormalContainerBlock", "OverContainerBlock"); - } - newLayer.parentNode.style.top = -height + "px"; - editBlock.style.display = "block"; - - //resize width of portlet/container control if IE + LTR align BEGIN - - var uiInfoBar = DOMUtil.findFirstDescendantByClass(editBlock, "div", "UIInfoBar"); - - if( uiInfoBar && (eXo.core.Browser.isIE6() || (eXo.core.Browser.isIE7() && eXo.core.I18n.isRT()))){ - //resize width of portlet/container only one time - if(uiInfoBar.style.width == ""){ - var dragControlArea = DOMUtil.findFirstDescendantByClass(uiInfoBar, "div", "DragControlArea"); - - var portletIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "div", "PortletIcon"); - var editPortletPropertiesIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "a", "EditPortletPropertiesIcon"); - var deletePortletIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "a", "DeletePortletIcon"); - - var contarnerIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "div", "ContainerIcon"); - var editContainerIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "a", "EditContainerIcon"); - var deleteContainerIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "a", "DeleteContainerIcon"); - - var uiInfoBarWidth = dragControlArea.offsetWidth; - - if(DOMUtil.hasClass(portlet, "UIPortlet")){ - uiInfoBarWidth += portletIcon.offsetWidth; - - if(editPortletPropertiesIcon){ - uiInfoBarWidth += editPortletPropertiesIcon.offsetWidth; - } - - if(deletePortletIcon){ - uiInfoBarWidth += deletePortletIcon.offsetWidth; - } - } - - if(DOMUtil.hasClass(portlet, "UIContainer")){ - uiInfoBarWidth += contarnerIcon.offsetWidth - - if(editContainerIcon){ - uiInfoBarWidth += editContainerIcon.offsetWidth; - } - - if(deleteContainerIcon){ - uiInfoBarWidth += deleteContainerIcon.offsetWidth; - } - } - - uiInfoBar.style.width= uiInfoBarWidth + 35 + "px"; - } - - } - //resize width of portlet/container control if IE + LTR align END - - } else { - editBlock.style.display = "none"; - if(!DOMUtil.hasClass(portlet, "UIPortlet")) { - var normalBlock = DOMUtil.findFirstChildByClass(portlet, "div", "OverContainerBlock"); - if(normalBlock) DOMUtil.replaceClass(normalBlock, "OverContainerBlock", "NormalContainerBlock"); - } - } - - // Don't display portlet control when View Container - var controlPortlet = DOMUtil.findFirstDescendantByClass(editBlock, "div", "CONTROL-PORTLET"); - if (controlPortlet) { - controlPortlet.style.display = eXo.portal.portalMode == 4 ? "none" : "block"; - } -}; -/** - * Get all UIPortlets of current UIWorkingWorkspace - * @return {Array} Array of UIComponents - */ -UIPortal.prototype.getUIPortlets = function() { - var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; - var founds = eXo.core.DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIPortlet") ; - var components = new Array() ; - for(j = 0; j < founds.length; j++) { - components[components.length] = new UIComponent(founds[j]) ; - } - return components ; -} ; -/** - * Get all UIPortlets is children of UIWorkingWorkspace - * @return {Array} Array of UIComponents - */ -UIPortal.prototype.getUIPortletsInUIPortal = function() { - var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; - var founds = eXo.core.DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIPortlet") ; - var components = new Array() ; - for(var j = 0; j < founds.length; j++) { - if(eXo.core.DOMUtil.findAncestorByClass(founds[j], 'UIPage') == null) { - components[components.length] = new UIComponent(founds[j]) ; - } - } - return components ; -} ; -/** - * Get all UIPortlets in UIPage - * @return {Array} components array of UIComponent objects - */ -UIPortal.prototype.getUIPortletsInUIPage = function() { - var uiPage = document.getElementById("UIPage") ; - var founds = eXo.core.DOMUtil.findDescendantsByClass(uiPage, "div", "UIPortlet"); - var components = new Array() ; - for(var j = 0; j < founds.length; j++) { - components[components.length] = new UIComponent(founds[j]) ; - } - return components ; -} ; -/** - * Get All UIContainers in current UIWorkingWorkspace - * @return {Array} components array of UIComponent objects - */ -UIPortal.prototype.getUIContainers = function() { - var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; - var founds = eXo.core.DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIContainer"); - var components = new Array() ; - for(var j = 0; j < founds.length; j++) { - components[j] = new UIComponent(founds[j]) ; - } - return components ; -}; -/** - * Get current UIPageBody - * @return {Object} UIPageBody object of this document - */ -UIPortal.prototype.getUIPageBody = function() { -// var uiPortal = document.getElementById("UIPortal") ; -// return new UIComponent(eXo.core.DOMUtil.findFirstDescendantByClass(uiPortal, "div", "UIPage")) ; - return new UIComponent(document.getElementById("UIPageBody")) ; -}; -/** - * Get current UIPortal - * @return {Object} UIComponent object that contains UIPortal object of this component - */ -UIPortal.prototype.getUIPortal = function() { - var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; - return new UIComponent(eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPortal")); -}; -/** - * Change page mode from view mode to layout mode - * @param {Object} uicomponent component contains this view (layout) - * @param {boolean} swapContent indicate changing content or not - */ -UIPortal.prototype.switchViewModeToLayoutMode = function(uicomponent, swapContent) { - var layoutBlock = uicomponent.getLayoutBlock() ; - if(!layoutBlock || layoutBlock.style.display == 'block') return ; - var viewBlock = uicomponent.getViewBlock() ; - if(swapContent && viewBlock) { - var contentNode = eXo.core.DOMUtil.findDescendantById(viewBlock, uicomponent.getId()) ; - if(contentNode != null) { - layoutBlock.innerHTML = ""; - layoutBlock.appendChild(contentNode) ; - } - } - try { - layoutBlock.style.display = "block" ; - viewBlock.style.display = "none" ; - } catch (err) {} -}; -/** - * Change page mode from layout mode to view mode - * @param {Object} uicomponent component contains this layout (view) - * @param {boolean} swapContent indicate changing content or not - */ -UIPortal.prototype.switchLayoutModeToViewMode = function(uicomponent, swapContent) { - var viewBlock = uicomponent.getViewBlock() ; - if(!viewBlock || viewBlock.style.display == 'block') return ; - var layoutBlock = uicomponent.getLayoutBlock() ; - if(swapContent && layoutBlock) { - var contentNode = eXo.core.DOMUtil.findDescendantById(layoutBlock, uicomponent.getId()) ; - if(contentNode != null) { - viewBlock.innerHTML = ""; - viewBlock.appendChild(contentNode) ; - } - } - try{ - viewBlock.style.display = "block" ; - layoutBlock.style.display = "none" ; - } catch(err) {} -} ; - -UIPortal.prototype.switchMode = function(elemtClicked) { - if(elemtClicked.className == "Icon PreviewIcon") { - elemtClicked.className = "Icon LayoutModeIcon" ; - this.showViewMode() ; - this.showMaskLayer() ; -// eXo.core.Browser.onScrollCallback("", eXo.portal.UIPortal.showMaskLayer()) ; - } else { - this.hideMaskLayer() ; - elemtClicked.className = "Icon PreviewIcon" ; - this.showLayoutModeForPortal() ; - } - /* - * minh.js.exo - * fix bug portal 1757; - */ - //eXo.portal.PortalDragDrop.fixCss(); -} ; - -//TODO: No longer use. Prepare to remove -//UIPortal.prototype.switchPortalMode = function(elemtClicked) { -// if(eXo.portal.portalMode%2 == 0) { -// this.showViewMode() ; -// } else { -// this.showLayoutModeForPortal() ; -// } -//}; -/** - * Switch mode of page - * @param {Object} elemtClicked clicked element - */ -UIPortal.prototype.switchModeForPage = function(elemtClicked) { - var layoutMode = this.showViewLayoutModeForPage(); - if(layoutMode == 1) { - elemtClicked.className = "Icon PagePreviewIcon" ; - this.hideMaskLayer() ; - } else if(layoutMode == 0) { - elemtClicked.className = "Icon PageLayoutModeIcon" ; - this.showMaskLayer() ; - } -} ; -/** - * Show area for dnd into this UIComponent - * @param {Object} uiComponent component contains control block - * @param {boolean} flag display (blocking) or hide control block - */ -UIPortal.prototype.showUIComponentControl = function(uicomponent, flag) { - var controlBlock = uicomponent.getControlBlock() ; - if(!controlBlock) return ; - var clickObject = eXo.core.DOMUtil.findFirstDescendantByClass(controlBlock, "div", "DragControlArea") ; -// if(flag) { -// clickObject.onmousedown = eXo.portal.PortalDragDrop.init ; -// controlBlock.style.display = 'block' ; -// } else { -// controlBlock.onmousedown = null ; -// controlBlock.style.display = 'none' ; -// } -}; -/** - * Change page to layout view - * @return layoutMode type of view mode (0, 1) - */ -UIPortal.prototype.showViewLayoutModeForPage = function() { - /* - * minh.js.exo; - */ - var layoutMode = -1; - var container = this.getUIContainers() ; - var portlet = this.getUIPortletsInUIPage() ; - - if(portlet.length > 0 && container.length >= 0) { - - for(var i = 0; i < container.length; i++) { - var viewBlock = container[i].getViewBlock() ; - if(viewBlock.style.display == 'block') { - this.switchViewModeToLayoutMode(container[i], true) ; - this.showUIComponentControl(container[i], this.component == 'UIContainer') ; - if(layoutMode == -1) layoutMode = 1; - } else if(viewBlock.style.display == 'none') { - this.switchLayoutModeToViewMode(container[i], true) ; - this.showUIComponentControl(container[i], false) ; - if(layoutMode == -1) layoutMode = 0; - } - } - for(var i = 0; i < portlet.length; i++) { - var viewBlock = portlet[i].getViewBlock() ; - if(viewBlock.style.display == 'block') { - this.switchViewModeToLayoutMode(portlet[i], false) ; - this.showUIComponentControl(portlet[i], this.component == 'UIPortlet') ; - if(layoutMode == -1) layoutMode = 1; - } else if(viewBlock.style.display == 'none') { - this.switchLayoutModeToViewMode(portlet[i], false) ; - this.showUIComponentControl(portlet[i], false) ; - if(layoutMode == -1) layoutMode = 0; - } - } - - } - - return layoutMode; -}; - - /**Repaired: by Vu Duy Tu 25/04/07**/ -UIPortal.prototype.showLayoutModeForPage = function(control) { - var uiPage = eXo.core.DOMUtil.findFirstDescendantByClass(document.body, "div", "UIPage") ; - if(uiPage == null) return; - var viewPage = eXo.core.DOMUtil.findFirstDescendantByClass(uiPage, "div", "VIEW-PAGE") ; - var uiPageDesktop = document.getElementById("UIPageDesktop") ; - var uiPortalApplication = document.getElementById("UIPortalApplication"); - if(uiPortalApplication.className != "Vista") { - viewPage.style.border = "solid 3px #dadada" ; - } - - viewPage.style.paddingTop = "50px" ; - viewPage.style.paddingRight = "0px"; - viewPage.style.paddingBottom = "50px"; - viewPage.style.paddingLeft = "0px"; - - if(control) this.component = control ; - var container = this.getUIContainers() ; - for(var i = 0; i < container.length; i++) { - this.switchViewModeToLayoutMode(container[i], true) ; - this.showUIComponentControl(container[i], this.component == 'UIContainer') ; - - var uiContainer = eXo.core.DOMUtil.findFirstDescendantByClass(viewPage, "div", "UIContainer") ; - if(uiContainer != null) { - viewPage.style.border = "none" ; - viewPage.style.paddingTop = "5px" ; - viewPage.style.paddingRight = "5px"; - viewPage.style.paddingBottom = "5px"; - viewPage.style.paddingLeft = "5px"; - } - } - - var portlet = this.getUIPortletsInUIPage() ; - for(var i = 0; i < portlet.length; i++) { - this.switchViewModeToLayoutMode(portlet[i], false) ; - this.showUIComponentControl(portlet[i], this.component == 'UIPortlet') ; - - var uiPortlet = eXo.core.DOMUtil.findFirstDescendantByClass(viewPage, "div", "UIPortlet") ; - if(uiPortlet != null) { - viewPage.style.border = "none" ; - viewPage.style.paddingTop = "5px" ; - viewPage.style.paddingRight = "5px" ; - viewPage.style.paddingBottom = "5px" ; - viewPage.style.paddingLeft = "5px" ; - } - } -}; - -UIPortal.prototype.showViewMode = function() { - var uiWorkingWS = document.getElementById("UIWorkingWorkspace"); - var isRTL = eXo.core.I18n.isRT(); - var portal = this.getUIPortal() ; - this.switchLayoutModeToViewMode(portal, true) ; - this.showUIComponentControl(portal, false) ; - - var uiPageDesktop = document.getElementById("UIPageDesktop") ; - var pageBody = this.getUIPageBody() ; - if(!uiPageDesktop) { - this.switchLayoutModeToViewMode(pageBody, true) ; - this.showUIComponentControl(pageBody, false) ; - } - - var container = this.getUIContainers() ; - for(var i = 0; i < container.length; i++) { - this.switchLayoutModeToViewMode(container[i], false) ; - this.showUIComponentControl(container[i], eXo.portal.portalMode > 2) ; - } - - var portlet = this.getUIPortlets() ; - for(var i = 0; i < portlet.length; i++) { - this.switchLayoutModeToViewMode(portlet[i], false) ; - this.showUIComponentControl(portlet[i], true) ; - var component = portlet[i].getUIComponentBlock(); - var mask = eXo.core.DOMUtil.findFirstDescendantByClass(component, "div", "UIPortletMask"); - if(eXo.portal.portalMode && mask && !eXo.core.DOMUtil.hasAncestor(portlet[i].getElement(), pageBody.getElement())) { - mask.style.display = "block"; - mask.style.height = component.offsetHeight + "px"; - mask.style.width = component.offsetWidth + "px"; - mask.style.top = -component.offsetHeight + "px"; - } else if(mask) { - mask.style.display = "none"; - } - } - - //mask for pagebody - if(!uiPageDesktop) { - if(container.length == 0 && portlet.length == 0) { - var pageIdElemt = document.getElementById("UIPage"); - var viewPage = eXo.core.DOMUtil.findAncestorByClass(pageIdElemt, "VIEW-PAGE"); - viewPage.style.paddingTop = "50px" ; - viewPage.style.paddingRight = "0px"; - viewPage.style.paddingBottom = "50px"; - viewPage.style.paddingLeft = "0px"; - } - var pageBodyBlock = pageBody.getUIComponentBlock(); - var mask = eXo.core.DOMUtil.findFirstDescendantByClass(pageBodyBlock, "div", "UIPageBodyMask"); - if(mask) { - mask.style.top = - pageBodyBlock.offsetHeight + "px"; - mask.style.height = pageBodyBlock.offsetHeight + "px"; - mask.style.width = pageBodyBlock.offsetWidth + "px"; - } - } -}; - -UIPortal.prototype.showLayoutModeForPortal = function(control) { - if(control) this.component = control; - var portal = this.getUIPortal() ; - this.switchViewModeToLayoutMode(portal, true) ; - this.showUIComponentControl(portal, this.component == 'UIPortal') ; - - var pageBody = this.getUIPageBody() ; - this.switchViewModeToLayoutMode(pageBody, false) ; - this.showUIComponentControl(pageBody, this.component == 'UIPageBody') ; - var pageBodyBlock = pageBody.getUIComponentBlock(); - var mask = eXo.core.DOMUtil.findFirstDescendantByClass(pageBodyBlock, "div", "UIPageBodyMask"); - if(mask) mask.style.display = "none"; - - var container = this.getUIContainers() ; - for(var i = 0; i < container.length; i++) { - this.switchViewModeToLayoutMode(container[i], false) ; - this.showUIComponentControl(container[i], true) ; - } - - var portlet = this.getUIPortlets() ; - for(var i = 0; i < portlet.length; i++) { - this.switchViewModeToLayoutMode(portlet[i], false) ; - this.showUIComponentControl(portlet[i], this.component == 'UIPortlet') ; - } -} ; - -/** - * Return the closest container of the element. - * It might be one of these : UIPortlet, UIContainer, UIPageBody, UIPortal - */ -UIPortal.prototype.findUIComponentOf = function(element) { - var DOMUtil = eXo.core.DOMUtil; - var parent; - if (parent = DOMUtil.findAncestorByClass(element, "UIPortlet")) { - return parent; - } else if (parent = DOMUtil.findAncestorByClass(element, "UIContainer")) { - return parent; - } else if (parent = DOMUtil.findAncestorByClass(element, "UIPageBody")) { - return parent; - } else if (parent = DOMUtil.findAncestorByClass(element, "UIPortal")) { - return parent; - } - - return null ; -}; -/** - * Display Mask layer infront of page's surface - */ -UIPortal.prototype.showMaskLayer = function() { - var uiPortalApplication = document.getElementById("UIPortalApplication") ; - var object = document.createElement("div") ; - object.className = "PreviewMode" ; - object.style.display = "none" ; - uiPortalApplication.appendChild(object) ; - - this.maskLayer = eXo.core.UIMaskLayer.createMask("UIPortalApplication", object, 30, "TOP-RIGHT") ; - this.maskLayer.title = this.previewTitle ; - this.maskLayer.style.cursor = "pointer" ; - this.maskLayer.onclick = function() { - var layoutModeIcon = eXo.core.DOMUtil.findFirstDescendantByClass(uiPortalApplication, "a", "LayoutModeIcon") ; - var pageLayoutModeIcon = eXo.core.DOMUtil.findFirstDescendantByClass(uiPortalApplication, "a", "PageLayoutModeIcon") ; - - if(layoutModeIcon) { - eXo.portal.UIPortal.switchMode(layoutModeIcon) ; - } - - if(pageLayoutModeIcon) { - eXo.portal.UIPortal.switchModeForPage(pageLayoutModeIcon) ; - } - } - this.maskLayer.style.zIndex = parseInt(object.style.zIndex) + 1 ; - eXo.core.Browser.addOnScrollCallback("3743892", eXo.core.UIMaskLayer.setPosition) ; -} ; -/** - * Hide (remove) mask layer from page's surface - */ -UIPortal.prototype.hideMaskLayer = function() { - if(this.maskLayer) { - var uiPortalApplication = document.getElementById("UIPortalApplication") ; - eXo.core.UIMaskLayer.removeMask(this.maskLayer) ; - this.maskLayer = null ; - var maskObject = eXo.core.DOMUtil.findFirstDescendantByClass(uiPortalApplication, "div", "PreviewMode") ; - uiPortalApplication.removeChild(maskObject) ; - } -} ; -/** - * Change skin of Portal - * @param url - */ -UIPortal.prototype.changeSkin = function(url) { - var skin = ''; - if(eXo.webui.UIItemSelector.SelectedItem != undefined) { - skin = eXo.webui.UIItemSelector.SelectedItem.option; - } - if(skin == undefined) skin = ''; - //ajaxAsyncGetRequest(url + '&skin='+skin, false); - window.location = url + '&skin='+skin; -} ; -/** - * Change language of Portal - * @param url - */ -UIPortal.prototype.changeLanguage = function(url) { - var language = ''; - if(eXo.webui.UIItemSelector.SelectedItem != undefined) { - language = eXo.webui.UIItemSelector.SelectedItem.option; - } - if(language == undefined) language = ''; - //ajaxAsyncGetRequest(url + '&language='+language, false); - window.location = url + '&language='+language; -} ; -/** - * Change current portal - */ -UIPortal.prototype.changePortal = function(accessPath, portal) { - window.location = eXo.env.server.context + "/" + accessPath + "/" + portal+"/"; -} ; - -/** Created: by Lxchiati **/ -UIPortal.prototype.popupButton = function(url, action) { - if(action == undefined) action = ''; - window.location = url + '&action='+ action ; -} ; -/** - * Remove a component of portal - * @param {String} componentId identifier of component - */ -UIPortal.prototype.removeComponent = function(componentId) { - var comp = document.getElementById(componentId); - var viewPage = eXo.core.DOMUtil.findAncestorByClass(comp, "VIEW-PAGE"); - - //Check if the removing component is a column - if (comp.parentNode.nodeName.toUpperCase() == "TD") eXo.core.DOMUtil.removeElement(comp.parentNode); - else eXo.core.DOMUtil.removeElement(comp); - - if(viewPage && eXo.portal.UIPortal.getUIContainers().length == 0 - && eXo.portal.UIPortal.getUIPortlets().length == 0) { - viewPage.style.paddingTop = "50px" ; - viewPage.style.paddingRight = "0px"; - viewPage.style.paddingBottom = "50px"; - viewPage.style.paddingLeft = "0px"; - } -}; - -/** - * Change Save button to editing state - */ -UIPortal.prototype.changeComposerSaveButton = function() { - if(eXo.portal.hasEditted == false) { - var uiWorkingWS = document.getElementById("UIWorkingWorkspace"); - var portalComposer = eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkingWS, "div", "UIPortalComposer"); - var saveButton = eXo.core.DOMUtil.findFirstDescendantByClass(portalComposer, "a", "SaveButton"); - if(saveButton) eXo.core.DOMUtil.replaceClass(saveButton, "SaveButton", "EdittedSaveButton"); - ajaxAsyncGetRequest(eXo.env.server.createPortalURL(portalComposer.id, "ChangeEdittedState", true)); - } -}; - -UIPortal.prototype.toggleComposer = function(clickedEle) { - var portalComposer = eXo.core.DOMUtil.findAncestorByClass(clickedEle, "UIPortalComposer"); - var content = eXo.core.DOMUtil.findFirstChildByClass(portalComposer, "div", "UIWindowContent"); - if(content && content.style.display != "none") { - content.style.display = "none"; - eXo.core.DOMUtil.replaceClass(clickedEle, "ExpandIcon", "CollapseIcon"); - } else { - content.style.display = "block"; - eXo.core.DOMUtil.replaceClass(clickedEle, "CollapseIcon", "ExpandIcon"); - } - var requestStr = eXo.env.server.createPortalURL(portalComposer.id, "Toggle", true); - ajaxAsyncGetRequest(requestStr); -}; - -/** - * Clollapse or expand an element (all its children) of tree - * @param {Object} element object to collapse or expand - */ -UIPortal.prototype.collapseExpand = function(element) { - var subGroup = eXo.core.DOMUtil.findFirstChildByClass(element.parentNode, "div", "ChildrenContainer") ; - var className = element.className; - if(!subGroup) return; - if(subGroup.style.display == "none") { - if (className.indexOf("ExpandIcon") == 0) element.className = "CollapseIcon ClearFix" ; - subGroup.style.display = "block" ; - } else { - if (className.indexOf("CollapseIcon") == 0) element.className = "ExpandIcon ClearFix" ; - subGroup.style.display = "none" ; - } -}; - -eXo.portal.UIPortalComponent = UIComponent.prototype.constructor ; -eXo.portal.UIPortal = new UIPortal() ; -eXo.portal.UIComponent = UIPortal.prototype.constructor ; Copied: epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js (from rev 8764, epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,671 @@ +/** + * 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. + */ + +function UIComponent(node) { + if(!node) return null; + this.node = node ; + this.type = node.className ; + var DOMUtil = eXo.core.DOMUtil; + var componentBlock = DOMUtil.findFirstDescendantByClass(node, "div", "UIComponentBlock"); + var children = DOMUtil.getChildrenByTagName(componentBlock, "div") ; + + for(var i=0; i<children.length; i++) { + if(DOMUtil.hasClass(children[i], "LAYOUT-BLOCK")) this.layout = children[i]; + else if(DOMUtil.hasClass(children[i], "VIEW-BLOCK")) this.view = children[i]; + else if(DOMUtil.hasClass(children[i], "EDITION-BLOCK")) this.control = children[i]; + } + + this.component = ""; + + if(DOMUtil.hasClass(node, "UIPortal")) this.id = node.id.replace("UIPortal-", ""); + else if(DOMUtil.hasClass(node, "UIPortlet")) this.id = node.id.replace("UIPortlet-", ""); + else if(DOMUtil.hasClass(node, "UIContainer")) this.id = node.id.replace("UIContainer-", ""); + else this.id = node.id; + +}; + +UIComponent.prototype.getId = function() { return this.id ; }; +UIComponent.prototype.getElement = function() { return this.node ; }; +UIComponent.prototype.getUIComponentType = function() { return this.type ; }; + +UIComponent.prototype.getUIComponentBlock = function() { return this.node ; }; +UIComponent.prototype.getControlBlock = function() { return this.control ; }; +UIComponent.prototype.getLayoutBlock = function() { return this.layout ; }; +UIComponent.prototype.getViewBlock = function() { return this.view ; }; + +/*******************************************************************************/ + +function UIPortal() { + this.portalUIComponentDragDrop = false; +}; + +UIPortal.prototype.blockOnMouseOver = function(event, portlet, isOver) { + var DOMUtil = eXo.core.DOMUtil; + if(!eXo.portal.portalMode || eXo.portal.isInDragging) return; + if(eXo.portal.portalMode <= 2 && DOMUtil.hasClass(portlet, "UIContainer")) return; + if(eXo.portal.portalMode > 2 && eXo.portal.portalMode != 4 && DOMUtil.hasClass(portlet, "UIPortlet")) return; + + if(!event) event = window.event; + event.cancelBubble = true; + + var component = DOMUtil.findFirstDescendantByClass(portlet, "div", "UIComponentBlock"); + var children = DOMUtil.getChildrenByTagName(component, "div"); + var layoutBlock; + var viewBlock; + var editBlock; + + for(var i=0; i<children.length; i++) { + if(DOMUtil.hasClass(children[i], "LAYOUT-BLOCK")) layoutBlock = children[i]; + else if(DOMUtil.hasClass(children[i], "VIEW-BLOCK")) viewBlock = children[i]; + else if(DOMUtil.hasClass(children[i], "EDITION-BLOCK")) editBlock = children[i]; + } + + if(!editBlock) return; + if(isOver) { + var newLayer = DOMUtil.findFirstDescendantByClass(editBlock, "div", "NewLayer"); + var height = 0; var width = 0; + if(layoutBlock && layoutBlock.style.display != "none") { + height = layoutBlock.offsetHeight; + width = layoutBlock.offsetWidth; + } else if(viewBlock && viewBlock.style.display != "none") { + height = viewBlock.offsetHeight; + width = viewBlock.offsetWidth; + } + + if(DOMUtil.hasClass(portlet, "UIPortlet")) { + newLayer.style.width = width + "px"; + newLayer.style.height = height + "px"; + } else { + newLayer.parentNode.style.width = width + "px"; + var normalBlock = DOMUtil.findFirstChildByClass(portlet, "div", "NormalContainerBlock"); + if(normalBlock) DOMUtil.replaceClass(normalBlock, "NormalContainerBlock", "OverContainerBlock"); + } + newLayer.parentNode.style.top = -height + "px"; + editBlock.style.display = "block"; + + //resize width of portlet/container control if IE + LTR align BEGIN + + var uiInfoBar = DOMUtil.findFirstDescendantByClass(editBlock, "div", "UIInfoBar"); + + if( uiInfoBar && (eXo.core.Browser.isIE6() || (eXo.core.Browser.isIE7() && eXo.core.I18n.isRT()))){ + //resize width of portlet/container only one time + if(uiInfoBar.style.width == ""){ + var dragControlArea = DOMUtil.findFirstDescendantByClass(uiInfoBar, "div", "DragControlArea"); + + var portletIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "div", "PortletIcon"); + var editPortletPropertiesIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "a", "EditPortletPropertiesIcon"); + var deletePortletIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "a", "DeletePortletIcon"); + + var contarnerIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "div", "ContainerIcon"); + var editContainerIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "a", "EditContainerIcon"); + var deleteContainerIcon = DOMUtil.findFirstDescendantByClass(uiInfoBar, "a", "DeleteContainerIcon"); + + var uiInfoBarWidth = dragControlArea.offsetWidth; + + if(DOMUtil.hasClass(portlet, "UIPortlet")){ + uiInfoBarWidth += portletIcon.offsetWidth; + + if(editPortletPropertiesIcon){ + uiInfoBarWidth += editPortletPropertiesIcon.offsetWidth; + } + + if(deletePortletIcon){ + uiInfoBarWidth += deletePortletIcon.offsetWidth; + } + } + + if(DOMUtil.hasClass(portlet, "UIContainer")){ + uiInfoBarWidth += contarnerIcon.offsetWidth + + if(editContainerIcon){ + uiInfoBarWidth += editContainerIcon.offsetWidth; + } + + if(deleteContainerIcon){ + uiInfoBarWidth += deleteContainerIcon.offsetWidth; + } + } + + uiInfoBar.style.width= uiInfoBarWidth + 35 + "px"; + } + + } + //resize width of portlet/container control if IE + LTR align END + + } else { + editBlock.style.display = "none"; + if(!DOMUtil.hasClass(portlet, "UIPortlet")) { + var normalBlock = DOMUtil.findFirstChildByClass(portlet, "div", "OverContainerBlock"); + if(normalBlock) DOMUtil.replaceClass(normalBlock, "OverContainerBlock", "NormalContainerBlock"); + } + } + + // Don't display portlet control when View Container + var controlPortlet = DOMUtil.findFirstDescendantByClass(editBlock, "div", "CONTROL-PORTLET"); + if (controlPortlet) { + controlPortlet.style.display = eXo.portal.portalMode == 4 ? "none" : "block"; + } +}; +/** + * Get all UIPortlets of current UIWorkingWorkspace + * @return {Array} Array of UIComponents + */ +UIPortal.prototype.getUIPortlets = function() { + var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; + var founds = eXo.core.DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIPortlet") ; + var components = new Array() ; + for(j = 0; j < founds.length; j++) { + components[components.length] = new UIComponent(founds[j]) ; + } + return components ; +} ; +/** + * Get all UIPortlets is children of UIWorkingWorkspace + * @return {Array} Array of UIComponents + */ +UIPortal.prototype.getUIPortletsInUIPortal = function() { + var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; + var founds = eXo.core.DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIPortlet") ; + var components = new Array() ; + for(var j = 0; j < founds.length; j++) { + if(eXo.core.DOMUtil.findAncestorByClass(founds[j], 'UIPage') == null) { + components[components.length] = new UIComponent(founds[j]) ; + } + } + return components ; +} ; +/** + * Get all UIPortlets in UIPage + * @return {Array} components array of UIComponent objects + */ +UIPortal.prototype.getUIPortletsInUIPage = function() { + var uiPage = document.getElementById("UIPage") ; + var founds = eXo.core.DOMUtil.findDescendantsByClass(uiPage, "div", "UIPortlet"); + var components = new Array() ; + for(var j = 0; j < founds.length; j++) { + components[components.length] = new UIComponent(founds[j]) ; + } + return components ; +} ; +/** + * Get All UIContainers in current UIWorkingWorkspace + * @return {Array} components array of UIComponent objects + */ +UIPortal.prototype.getUIContainers = function() { + var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; + var founds = eXo.core.DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIContainer"); + var components = new Array() ; + for(var j = 0; j < founds.length; j++) { + components[j] = new UIComponent(founds[j]) ; + } + return components ; +}; +/** + * Get current UIPageBody + * @return {Object} UIPageBody object of this document + */ +UIPortal.prototype.getUIPageBody = function() { +// var uiPortal = document.getElementById("UIPortal") ; +// return new UIComponent(eXo.core.DOMUtil.findFirstDescendantByClass(uiPortal, "div", "UIPage")) ; + return new UIComponent(document.getElementById("UIPageBody")) ; +}; +/** + * Get current UIPortal + * @return {Object} UIComponent object that contains UIPortal object of this component + */ +UIPortal.prototype.getUIPortal = function() { + var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ; + return new UIComponent(eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPortal")); +}; +/** + * Change page mode from view mode to layout mode + * @param {Object} uicomponent component contains this view (layout) + * @param {boolean} swapContent indicate changing content or not + */ +UIPortal.prototype.switchViewModeToLayoutMode = function(uicomponent, swapContent) { + var layoutBlock = uicomponent.getLayoutBlock() ; + if(!layoutBlock || layoutBlock.style.display == 'block') return ; + var viewBlock = uicomponent.getViewBlock() ; + if(swapContent && viewBlock) { + var contentNode = eXo.core.DOMUtil.findDescendantById(viewBlock, uicomponent.getId()) ; + if(contentNode != null) { + layoutBlock.innerHTML = ""; + layoutBlock.appendChild(contentNode) ; + } + } + try { + layoutBlock.style.display = "block" ; + viewBlock.style.display = "none" ; + } catch (err) {} +}; +/** + * Change page mode from layout mode to view mode + * @param {Object} uicomponent component contains this layout (view) + * @param {boolean} swapContent indicate changing content or not + */ +UIPortal.prototype.switchLayoutModeToViewMode = function(uicomponent, swapContent) { + var viewBlock = uicomponent.getViewBlock() ; + if(!viewBlock || viewBlock.style.display == 'block') return ; + var layoutBlock = uicomponent.getLayoutBlock() ; + if(swapContent && layoutBlock) { + var contentNode = eXo.core.DOMUtil.findDescendantById(layoutBlock, uicomponent.getId()) ; + if(contentNode != null) { + viewBlock.innerHTML = ""; + viewBlock.appendChild(contentNode) ; + } + } + try{ + viewBlock.style.display = "block" ; + layoutBlock.style.display = "none" ; + } catch(err) {} +} ; + +UIPortal.prototype.switchMode = function(elemtClicked) { + if(elemtClicked.className == "Icon PreviewIcon") { + elemtClicked.className = "Icon LayoutModeIcon" ; + this.showViewMode() ; + this.showMaskLayer() ; +// eXo.core.Browser.onScrollCallback("", eXo.portal.UIPortal.showMaskLayer()) ; + } else { + this.hideMaskLayer() ; + elemtClicked.className = "Icon PreviewIcon" ; + this.showLayoutModeForPortal() ; + } + /* + * minh.js.exo + * fix bug portal 1757; + */ + //eXo.portal.PortalDragDrop.fixCss(); +} ; + +//TODO: No longer use. Prepare to remove +//UIPortal.prototype.switchPortalMode = function(elemtClicked) { +// if(eXo.portal.portalMode%2 == 0) { +// this.showViewMode() ; +// } else { +// this.showLayoutModeForPortal() ; +// } +//}; +/** + * Switch mode of page + * @param {Object} elemtClicked clicked element + */ +UIPortal.prototype.switchModeForPage = function(elemtClicked) { + var layoutMode = this.showViewLayoutModeForPage(); + if(layoutMode == 1) { + elemtClicked.className = "Icon PagePreviewIcon" ; + this.hideMaskLayer() ; + } else if(layoutMode == 0) { + elemtClicked.className = "Icon PageLayoutModeIcon" ; + this.showMaskLayer() ; + } +} ; +/** + * Show area for dnd into this UIComponent + * @param {Object} uiComponent component contains control block + * @param {boolean} flag display (blocking) or hide control block + */ +UIPortal.prototype.showUIComponentControl = function(uicomponent, flag) { + var controlBlock = uicomponent.getControlBlock() ; + if(!controlBlock) return ; + var clickObject = eXo.core.DOMUtil.findFirstDescendantByClass(controlBlock, "div", "DragControlArea") ; +// if(flag) { +// clickObject.onmousedown = eXo.portal.PortalDragDrop.init ; +// controlBlock.style.display = 'block' ; +// } else { +// controlBlock.onmousedown = null ; +// controlBlock.style.display = 'none' ; +// } +}; +/** + * Change page to layout view + * @return layoutMode type of view mode (0, 1) + */ +UIPortal.prototype.showViewLayoutModeForPage = function() { + /* + * minh.js.exo; + */ + var layoutMode = -1; + var container = this.getUIContainers() ; + var portlet = this.getUIPortletsInUIPage() ; + + if(portlet.length > 0 && container.length >= 0) { + + for(var i = 0; i < container.length; i++) { + var viewBlock = container[i].getViewBlock() ; + if(viewBlock.style.display == 'block') { + this.switchViewModeToLayoutMode(container[i], true) ; + this.showUIComponentControl(container[i], this.component == 'UIContainer') ; + if(layoutMode == -1) layoutMode = 1; + } else if(viewBlock.style.display == 'none') { + this.switchLayoutModeToViewMode(container[i], true) ; + this.showUIComponentControl(container[i], false) ; + if(layoutMode == -1) layoutMode = 0; + } + } + for(var i = 0; i < portlet.length; i++) { + var viewBlock = portlet[i].getViewBlock() ; + if(viewBlock.style.display == 'block') { + this.switchViewModeToLayoutMode(portlet[i], false) ; + this.showUIComponentControl(portlet[i], this.component == 'UIPortlet') ; + if(layoutMode == -1) layoutMode = 1; + } else if(viewBlock.style.display == 'none') { + this.switchLayoutModeToViewMode(portlet[i], false) ; + this.showUIComponentControl(portlet[i], false) ; + if(layoutMode == -1) layoutMode = 0; + } + } + + } + + return layoutMode; +}; + + /**Repaired: by Vu Duy Tu 25/04/07**/ +UIPortal.prototype.showLayoutModeForPage = function(control) { + var uiPage = eXo.core.DOMUtil.findFirstDescendantByClass(document.body, "div", "UIPage") ; + if(uiPage == null) return; + var viewPage = eXo.core.DOMUtil.findFirstDescendantByClass(uiPage, "div", "VIEW-PAGE") ; + var uiPageDesktop = document.getElementById("UIPageDesktop") ; + var uiPortalApplication = document.getElementById("UIPortalApplication"); + if(uiPortalApplication.className != "Vista") { + viewPage.style.border = "solid 3px #dadada" ; + } + + viewPage.style.paddingTop = "50px" ; + viewPage.style.paddingRight = "0px"; + viewPage.style.paddingBottom = "50px"; + viewPage.style.paddingLeft = "0px"; + + if(control) this.component = control ; + var container = this.getUIContainers() ; + for(var i = 0; i < container.length; i++) { + this.switchViewModeToLayoutMode(container[i], true) ; + this.showUIComponentControl(container[i], this.component == 'UIContainer') ; + + var uiContainer = eXo.core.DOMUtil.findFirstDescendantByClass(viewPage, "div", "UIContainer") ; + if(uiContainer != null) { + viewPage.style.border = "none" ; + viewPage.style.paddingTop = "5px" ; + viewPage.style.paddingRight = "5px"; + viewPage.style.paddingBottom = "5px"; + viewPage.style.paddingLeft = "5px"; + } + } + + var portlet = this.getUIPortletsInUIPage() ; + for(var i = 0; i < portlet.length; i++) { + this.switchViewModeToLayoutMode(portlet[i], false) ; + this.showUIComponentControl(portlet[i], this.component == 'UIPortlet') ; + + var uiPortlet = eXo.core.DOMUtil.findFirstDescendantByClass(viewPage, "div", "UIPortlet") ; + if(uiPortlet != null) { + viewPage.style.border = "none" ; + viewPage.style.paddingTop = "5px" ; + viewPage.style.paddingRight = "5px" ; + viewPage.style.paddingBottom = "5px" ; + viewPage.style.paddingLeft = "5px" ; + } + } +}; + +UIPortal.prototype.showViewMode = function() { + var uiWorkingWS = document.getElementById("UIWorkingWorkspace"); + var isRTL = eXo.core.I18n.isRT(); + var portal = this.getUIPortal() ; + this.switchLayoutModeToViewMode(portal, true) ; + this.showUIComponentControl(portal, false) ; + + var uiPageDesktop = document.getElementById("UIPageDesktop") ; + var pageBody = this.getUIPageBody() ; + if(!uiPageDesktop) { + this.switchLayoutModeToViewMode(pageBody, true) ; + this.showUIComponentControl(pageBody, false) ; + } + + var container = this.getUIContainers() ; + for(var i = 0; i < container.length; i++) { + this.switchLayoutModeToViewMode(container[i], false) ; + this.showUIComponentControl(container[i], eXo.portal.portalMode > 2) ; + } + + var portlet = this.getUIPortlets() ; + for(var i = 0; i < portlet.length; i++) { + this.switchLayoutModeToViewMode(portlet[i], false) ; + this.showUIComponentControl(portlet[i], true) ; + var component = portlet[i].getUIComponentBlock(); + var mask = eXo.core.DOMUtil.findFirstDescendantByClass(component, "div", "UIPortletMask"); + if(eXo.portal.portalMode && mask && !eXo.core.DOMUtil.hasAncestor(portlet[i].getElement(), pageBody.getElement())) { + mask.style.display = "block"; + mask.style.height = component.offsetHeight + "px"; + mask.style.width = component.offsetWidth + "px"; + mask.style.top = -component.offsetHeight + "px"; + } else if(mask) { + mask.style.display = "none"; + } + } + + //mask for pagebody + if(!uiPageDesktop) { + if(container.length == 0 && portlet.length == 0) { + var pageIdElemt = document.getElementById("UIPage"); + var viewPage = eXo.core.DOMUtil.findAncestorByClass(pageIdElemt, "VIEW-PAGE"); + viewPage.style.paddingTop = "50px" ; + viewPage.style.paddingRight = "0px"; + viewPage.style.paddingBottom = "50px"; + viewPage.style.paddingLeft = "0px"; + } + var pageBodyBlock = pageBody.getUIComponentBlock(); + var mask = eXo.core.DOMUtil.findFirstDescendantByClass(pageBodyBlock, "div", "UIPageBodyMask"); + if(mask) { + mask.style.top = - pageBodyBlock.offsetHeight + "px"; + mask.style.height = pageBodyBlock.offsetHeight + "px"; + mask.style.width = pageBodyBlock.offsetWidth + "px"; + } + } +}; + +UIPortal.prototype.showLayoutModeForPortal = function(control) { + if(control) this.component = control; + var portal = this.getUIPortal() ; + this.switchViewModeToLayoutMode(portal, true) ; + this.showUIComponentControl(portal, this.component == 'UIPortal') ; + + var pageBody = this.getUIPageBody() ; + this.switchViewModeToLayoutMode(pageBody, false) ; + this.showUIComponentControl(pageBody, this.component == 'UIPageBody') ; + var pageBodyBlock = pageBody.getUIComponentBlock(); + var mask = eXo.core.DOMUtil.findFirstDescendantByClass(pageBodyBlock, "div", "UIPageBodyMask"); + if(mask) mask.style.display = "none"; + + var container = this.getUIContainers() ; + for(var i = 0; i < container.length; i++) { + this.switchViewModeToLayoutMode(container[i], false) ; + this.showUIComponentControl(container[i], true) ; + } + + var portlet = this.getUIPortlets() ; + for(var i = 0; i < portlet.length; i++) { + this.switchViewModeToLayoutMode(portlet[i], false) ; + this.showUIComponentControl(portlet[i], this.component == 'UIPortlet') ; + } +} ; + +/** + * Return the closest container of the element. + * It might be one of these : UIPortlet, UIContainer, UIPageBody, UIPortal + */ +UIPortal.prototype.findUIComponentOf = function(element) { + var DOMUtil = eXo.core.DOMUtil; + var parent = element.parentNode ; + while(parent != null) { + if(DOMUtil.hasClass(parent,'UIPortlet') || DOMUtil.hasClass(parent,'UIContainer') || + DOMUtil.hasClass(parent,'UIPageBody') || DOMUtil.hasClass(parent,'UIPortal')) { + return parent ; + } + parent = parent.parentNode ; + } + return null ; +}; +/** + * Display Mask layer infront of page's surface + */ +UIPortal.prototype.showMaskLayer = function() { + var uiPortalApplication = document.getElementById("UIPortalApplication") ; + var object = document.createElement("div") ; + object.className = "PreviewMode" ; + object.style.display = "none" ; + uiPortalApplication.appendChild(object) ; + + this.maskLayer = eXo.core.UIMaskLayer.createMask("UIPortalApplication", object, 30, "TOP-RIGHT") ; + this.maskLayer.title = this.previewTitle ; + this.maskLayer.style.cursor = "pointer" ; + this.maskLayer.onclick = function() { + var layoutModeIcon = eXo.core.DOMUtil.findFirstDescendantByClass(uiPortalApplication, "a", "LayoutModeIcon") ; + var pageLayoutModeIcon = eXo.core.DOMUtil.findFirstDescendantByClass(uiPortalApplication, "a", "PageLayoutModeIcon") ; + + if(layoutModeIcon) { + eXo.portal.UIPortal.switchMode(layoutModeIcon) ; + } + + if(pageLayoutModeIcon) { + eXo.portal.UIPortal.switchModeForPage(pageLayoutModeIcon) ; + } + } + this.maskLayer.style.zIndex = parseInt(object.style.zIndex) + 1 ; + eXo.core.Browser.addOnScrollCallback("3743892", eXo.core.UIMaskLayer.setPosition) ; +} ; +/** + * Hide (remove) mask layer from page's surface + */ +UIPortal.prototype.hideMaskLayer = function() { + if(this.maskLayer) { + var uiPortalApplication = document.getElementById("UIPortalApplication") ; + eXo.core.UIMaskLayer.removeMask(this.maskLayer) ; + this.maskLayer = null ; + var maskObject = eXo.core.DOMUtil.findFirstDescendantByClass(uiPortalApplication, "div", "PreviewMode") ; + uiPortalApplication.removeChild(maskObject) ; + } +} ; +/** + * Change skin of Portal + * @param url + */ +UIPortal.prototype.changeSkin = function(url) { + var skin = ''; + if(eXo.webui.UIItemSelector.SelectedItem != undefined) { + skin = eXo.webui.UIItemSelector.SelectedItem.option; + } + if(skin == undefined) skin = ''; + //ajaxAsyncGetRequest(url + '&skin='+skin, false); + window.location = url + '&skin='+skin; +} ; +/** + * Change language of Portal + * @param url + */ +UIPortal.prototype.changeLanguage = function(url) { + var language = ''; + if(eXo.webui.UIItemSelector.SelectedItem != undefined) { + language = eXo.webui.UIItemSelector.SelectedItem.option; + } + if(language == undefined) language = ''; + //ajaxAsyncGetRequest(url + '&language='+language, false); + window.location = url + '&language='+language; +} ; +/** + * Change current portal + */ +UIPortal.prototype.changePortal = function(accessPath, portal) { + window.location = eXo.env.server.context + "/" + accessPath + "/" + portal+"/"; +} ; + +/** Created: by Lxchiati **/ +UIPortal.prototype.popupButton = function(url, action) { + if(action == undefined) action = ''; + window.location = url + '&action='+ action ; +} ; +/** + * Remove a component of portal + * @param {String} componentId identifier of component + */ +UIPortal.prototype.removeComponent = function(componentId) { + var comp = document.getElementById(componentId); + var viewPage = eXo.core.DOMUtil.findAncestorByClass(comp, "VIEW-PAGE"); + + //Check if the removing component is a column + if (comp.parentNode.nodeName.toUpperCase() == "TD") eXo.core.DOMUtil.removeElement(comp.parentNode); + else eXo.core.DOMUtil.removeElement(comp); + + if(viewPage && eXo.portal.UIPortal.getUIContainers().length == 0 + && eXo.portal.UIPortal.getUIPortlets().length == 0) { + viewPage.style.paddingTop = "50px" ; + viewPage.style.paddingRight = "0px"; + viewPage.style.paddingBottom = "50px"; + viewPage.style.paddingLeft = "0px"; + } +}; + +/** + * Change Save button to editing state + */ +UIPortal.prototype.changeComposerSaveButton = function() { + if(eXo.portal.hasEditted == false) { + var uiWorkingWS = document.getElementById("UIWorkingWorkspace"); + var portalComposer = eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkingWS, "div", "UIPortalComposer"); + var saveButton = eXo.core.DOMUtil.findFirstDescendantByClass(portalComposer, "a", "SaveButton"); + if(saveButton) eXo.core.DOMUtil.replaceClass(saveButton, "SaveButton", "EdittedSaveButton"); + ajaxAsyncGetRequest(eXo.env.server.createPortalURL(portalComposer.id, "ChangeEdittedState", true)); + } +}; + +UIPortal.prototype.toggleComposer = function(clickedEle) { + var portalComposer = eXo.core.DOMUtil.findAncestorByClass(clickedEle, "UIPortalComposer"); + var content = eXo.core.DOMUtil.findFirstChildByClass(portalComposer, "div", "UIWindowContent"); + if(content && content.style.display != "none") { + content.style.display = "none"; + eXo.core.DOMUtil.replaceClass(clickedEle, "ExpandIcon", "CollapseIcon"); + } else { + content.style.display = "block"; + eXo.core.DOMUtil.replaceClass(clickedEle, "CollapseIcon", "ExpandIcon"); + } + var requestStr = eXo.env.server.createPortalURL(portalComposer.id, "Toggle", true); + ajaxAsyncGetRequest(requestStr); +}; + +/** + * Clollapse or expand an element (all its children) of tree + * @param {Object} element object to collapse or expand + */ +UIPortal.prototype.collapseExpand = function(element) { + var subGroup = eXo.core.DOMUtil.findFirstChildByClass(element.parentNode, "div", "ChildrenContainer") ; + var className = element.className; + if(!subGroup) return; + if(subGroup.style.display == "none") { + if (className.indexOf("ExpandIcon") == 0) element.className = "CollapseIcon ClearFix" ; + subGroup.style.display = "block" ; + } else { + if (className.indexOf("CollapseIcon") == 0) element.className = "ExpandIcon ClearFix" ; + subGroup.style.display = "none" ; + } +}; + +eXo.portal.UIPortalComponent = UIComponent.prototype.constructor ; +eXo.portal.UIPortal = new UIPortal() ; +eXo.portal.UIComponent = UIPortal.prototype.constructor ; Deleted: epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,295 +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. - */ - -.UIPortlet .LAYOUT-BLOCK { - padding: 5px; -} - -.UIPortlet .CONTROL-PORTLET { - left: 0; /* orientation=lt */ - right: 0; /* orientation=rt */ -} - -.UIPortlet .CONTROL-PORTLET .Login { - background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/ToolIcons/Key.gif') no-repeat center; -} - -.UIPortlet .CONTROL-PORTLET .DragControlArea { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 7px; height: 13px; - margin: 5px 0px 0px 3px; /* orientation=lt */ - margin: 5px 3px 0px 0px; /* orientation=rt */ - background: url('background/DragBg2x2.gif'); - cursor: move; -} - -.UIPortlet .ViewPortletIcon { - float: right; /* orientation=lt */ - float: left; /* orientation=rt */ - width: 16px; height: 16px; - margin: 4px 5px 0px 0px; /* orientation=lt */ - margin: 4px 0px 0px 5px; /* orientation=rt */ - background: url('background/BlueBoxLight.gif') no-repeat; - cursor: pointer; -} - -.UIPortlet .EditPortletPropertiesIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 20px; height: 20px; - background: url('background/Pen.gif') no-repeat top; - margin: 4px 0px 0px 5px; /* orientation=lt */ - margin: 4px 5px 0px 0px; /* orientation=rt */ -} - -.UIPortlet .DeletePortletIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 20px; height:20px; - background: url('background/Close.gif') no-repeat bottom; - margin: 0px 0px 0px 2px; /* orientation=lt */ - margin: 0px 2px 0px 0px; /* orientation=rt */ -} - -.UIPortlet .SelectedContainerBlock { - background: white; - border-top: 1px solid #91bcdd; -} - -.UIPortlet .SelectedContainerBlock .LeftContainerBlock { - background: url('background/BgContainerBlock.gif') no-repeat left top; - padding-left: 1px; -} - -.UIPortlet .SelectedContainerBlock .RightContainerBlock { - background: url('background/BgContainerBlock.gif') no-repeat right top; - padding: 4px; -} - -.UIPortlet .NewLayer { - background: #d1dce5; - filter: alpha(opacity=80); - opacity: 0.8; - width: 100%; height: 100%; -} - -/*##############################- PortletLayoutDecorator -################################*/ - -.PortletLayoutDecorator { -} - -.PortletLayoutDecorator .LPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') no-repeat left top; - padding: 0px 0px 0px 12px; -} - -.PortletLayoutDecorator .RPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') no-repeat right top; - padding-right: 12px; -} - -.PortletLayoutDecorator .CPortletLayoutDecorator { - background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px; -} - -.PortletLayoutDecorator .FixHeight { - height: 69px; - padding: 10px 0; -} -.ProtectedPortlet .PortletLayoutDecorator { - background: white; -} -.ProtectedPortlet .PortletLayoutDecorator .LPortletLayoutDecorator { - opacity: 0.3; - filter: alpha(opacity=30); -} -/*############### End Decorator ###################################################*/ - -.LAYOUT-CONTAINER .UIContainer { - height: 100%; - /* - fix bug dragdrop in IE6 - */ -} - -.LAYOUT-CONTAINER .TDContainer { - padding: 0px 2px; -} - -.UIContainer .LAYOUT-BLOCK .UIRowContainer { - min-height: 86px; - _height: 86px; -} - -.UIContainer .VIEW-BLOCK .EmptyContainer { - height: 82px; -} - -.UIContainer .NewLayer { - background: #93c0e2; - filter: alpha(opacity=40); - opacity: 0.4; - width: 100%; height: 100%; -} - -/* -.UIContainer .LAYOUT-CONTAINER { - background: #f5f5f5; - border: solid 1px #38acf3; - padding: 5px; - margin: 0px 1px; - min-height: 60px; -} - -* html .UIContainer .LAYOUT-CONTAINER { - height: 60px; -} - -.UIContainer .UIInfoBar .BlueRoundedStyle { - padding: 0px; margin: 0px; - height: 22px; -} -*/ - -.UIContainer .CONTROL-CONTAINER .DragControlArea { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 7px; height: 13px; - background: url('background/DragBg2x2.gif'); - cursor: move; - margin: 5px 0px 0px 2px; /* orientation=lt */ - margin: 5px 2px 0px 0px; /* orientation=rt */ -} - -.UIContainer .LAYOUT-CONTAINER .UITableColumnContainer { - background: none; - border: none; - margin: auto; -} - -.UIContainer .EditContainerIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 22px; height: 16px; - background: url('background/Pen.gif') no-repeat top; - margin: 4px 2px 0px 0px; /* orientation=lt */ - margin: 4px 0px 0px 2px; /* orientation=rt */ -} - -.UIContainer .DeleteContainerIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - width: 22px; height: 16px; - background: url('background/Close.gif') no-repeat bottom; - margin: 4px 0px 0px 0px; /* orientation=lt */ - margin: 4px 0px 0px 0px; /* orientation=rt */ -} - -.UIContainer .ContainerIcon { - float: left; /* orientation=lt */ - float: right; /* orientation=rt */ - height: 16px; line-height: 16px; - padding-left: 24px; /* orientation=lt */ - padding-right: 24px; /* orientation=rt */ - margin: 3px 0px 0px 5px; /* orientation=lt */ - margin: 3px 5px 0px 0px; /* orientation=rt */ - background: url('background/DefaultContainerIcon.png') no-repeat; -} - -.UIPortal .LAYOUT-PORTAL { - /* background: url('background/PortalBackground4x4.gif');*/ - background: white; - padding: 8px; - _padding: 8px 0px; /* orientation=rt */ - margin: auto; - _margin: 0px; /* orientation=rt */ - _width: 99%; /* orientation=rt */ -} - -.DragAndDropPreview { - width: auto; height: 80px; - background: url('background/DragAndDropPreview4x4.gif'); - border: 1px solid #c4c4c4; - margin: 0px 12px 10px 12px; -} - -.PortletBlockDecorator { - -} - -.EdittingContainer { - padding: 3px; -} - -.EdittingContainer .NormalContainerBlock { - background: white; - border: 1px dashed #a2a2a2; - height: 100%; -} - -.EdittingContainer .NormalContainerBlock .LeftContainerBlock, -.EdittingContainer .OverContainerBlock .NormalContainerBlock .LeftContainerBlock { - background: none; -} - -.EdittingContainer .NormalContainerBlock .RightContainerBlock, -.EdittingContainer .OverContainerBlock .NormalContainerBlock .RightContainerBlock { - padding: 2px; - background: none; -} - -.UIContainer .UIPortlet { - padding: 0px; -} - -.UIPortletMask { - opacity: 0; - filter: alpha(opacity=0); - background: #ffffff; -} - -.EdittingContainer .OverContainerBlock { - border: 1px solid #b8babf; - background: none; - height: 100%; -} - -.EdittingContainer .OverContainerBlock .LeftContainerBlock { - background: white; -} - -.EdittingContainer .OverContainerBlock .RightContainerBlock { - background: none; - padding: 2px; -} - -.ProtectedContainer .ProtectedContent { - opacity: 0.3; - filter: alpha(opacity=80); - height: 70px; - padding: 6px 10px; -} - -.UIPageBodyMask { - opacity: 0; - filter: alpha(opacity=0); - background: #ffffff; - cursor:move; -} Copied: epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css (from rev 8764, epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,200 @@ +.UIPortal .LAYOUT-PORTAL { + background: white; + padding: 8px; + _padding: 8px 0px; /* orientation=rt */ + margin: auto; + _margin: 0px; /* orientation=rt */ + _width: 99%; /* orientation=rt */ +} + +.DragAndDropPreview { + width: auto; height: 80px; + background: url('background/DragAndDropPreview4x4.gif'); + border: 1px solid #c4c4c4; + margin: 0px 12px 10px 12px; +} + +/************** style for EDITION-BLOCK *****************/ + +.EDITION-BLOCK .CONTROL-BLOCK { + position: absolute; + top: -5px; + left: 4px; /* orientation=lt */ + right: 4px; /* orientation=rt */ + white-space: nowrap; +} + +.EDITION-BLOCK .NewLayer { + background: #93c0e2; + filter: alpha(opacity=40); + opacity: 0.4; + width: 100%; height: 100%; +} + +.EDITION-BLOCK .DragControlArea { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + width: 7px; height: 13px; + background: url('background/DragBg2x2.gif'); + cursor: move; + margin: 3px 0px 0px 2px; /* orientation=lt */ + margin: 3px 2px 0px 0px; /* orientation=rt */ + display: block; +} + +.EDITION-BLOCK .EditIcon { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + width: 22px; height: 16px; + background: url('background/Pen.gif') no-repeat top; + margin: 2px 2px 0px 0px; /* orientation=lt */ + margin: 2px 0px 0px 2px; /* orientation=rt */ +} + +.EDITION-BLOCK .DeleteIcon { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + width: 22px; height: 16px; + background: url('background/Close.gif') no-repeat bottom; + margin: 2px 0px 0px 0px; /* orientation=lt */ + margin: 2px 0px 0px 0px; /* orientation=rt */ +} + +.EDITION-BLOCK .ContainerIcon { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + padding-left: 24px; /* orientation=lt */ + padding-right: 24px; /* orientation=rt */ + margin: 0px 0px 0px 5px; /* orientation=lt */ + margin: 0px 5px 0px 0px; /* orientation=rt */ + background: url('background/DefaultContainerIcon.gif') no-repeat left 3px; /* orientation=lt */ + background: url('background/DefaultContainerIcon.gif') no-repeat right 1px; /* orientation=rt */ +} + +.UIColumnContainer .ControlIcon { + float: right;/* orientation=lt */ + float: left;/* orientation=rt */ + width: 28px; + height: 20px; + cursor: pointer; + background: url('/eXoResources/skin/PortletThemes/background/DefaultTheme.png') no-repeat center; +} + +.UIColumnContainer .ArrowDownIcon { + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + width: 22px; height: 16px; + background: url('background/ArrowDown.gif') no-repeat center top; + margin: 3px 0px 0px 2px; /* orientation=lt */ + margin: 3px 2px 0px 0px; /* orientation=rt */ +} + +.EDITION-BLOCK .PortletIcon { + background: url('background/Earth.gif') no-repeat left center; /* orientation=lt */ + background: url('background/Earth.gif') no-repeat right center; /* orientation=rt */ + float: left; /* orientation=lt */ + float: right; /* orientation=rt */ + text-overflow: ellipsis; + width: auto; + line-height: 19px; + padding-left: 25px; /* orientation=lt */ + padding-right: 25px; /* orientation=rt */ + margin: 0px 0px 0px 6px; /* orientation=lt */ + margin: 0px 6px 0px 0px; /* orientation=rt */ + color: black; +} + +/****************** edit Application *********************/ +.UIPortlet .LAYOUT-BLOCK { + padding: 2px; +} + +.UIPortlet .CONTROL-PORTLET .Login { + background: url('/eXoResources/skin/DefaultSkin/skinIcons/16x16/icons/ToolIcons/Key.gif') no-repeat center; +} + +/****************** edit Container *********************/ +.EdittingContainer { + padding: 3px; +} + +.EdittingContainer .NormalContainerBlock { + background: white; + border: 1px dashed #a2a2a2; + height: 100%; + padding: 2px; +} +.EdittingContainer .OverContainerBlock { + border: 1px solid #b8babf; + background: white; + height: 100%; + padding: 2px; +} + +.EdittingContainer .LAYOUT-BLOCK .UIRowContainer { + min-height: 86px; + _height: 86px; +} + +.EdittingContainer .VIEW-BLOCK .EmptyContainer { + height: 82px; +} + +.EdittingContainer .LAYOUT-CONTAINER .UIContainer { + _height: 100%; + /* + fix bug dragdrop in IE6 + */ +} + +/*##############################- PortletLayoutDecorator -################################*/ + +.PortletLayoutDecorator { +} + +.PortletLayoutDecorator .LPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') no-repeat left top; + padding: 0px 0px 0px 12px; +} + +.PortletLayoutDecorator .RPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') no-repeat right top; + padding-right: 12px; +} + +.PortletLayoutDecorator .CPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px; + height: 69px; + padding: 10px 0; +} + +/*############### End Decorator ###################################################*/ + +.ProtectedContainer .ProtectedContent { + opacity: 0.3; + filter: alpha(opacity=80); + height: 70px; + padding: 6px 10px; +} + +.ProtectedPortlet .PortletLayoutDecorator { + background: white; +} + +.ProtectedPortlet .PortletLayoutDecorator .LPortletLayoutDecorator { + opacity: 0.3; + filter: alpha(opacity=30); +} + +.UIPortletMask { + opacity: 0; + filter: alpha(opacity=0); + background: #ffffff; +} + +.UIPageBodyMask { + opacity: 0; + filter: alpha(opacity=0); + background: #ffffff; + cursor:move; +} Modified: epp/portal/tags/EPP_5_2_2_ER01/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,40 +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. - --> - -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> - - <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" - lockAcquisitionTimeout="20000" /> - - <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}"> - <stateRetrieval timeout="20000" fetchInMemoryState="false" /> - <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> - <sync /> - </clustering> - - <!-- Eviction configuration --> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" - actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" - eventQueueSize="1000000"> - <property name="maxNodes" value="5000"/> - <property name="minTimeToLive" value="20000"/> - </default> - </eviction> -</jbosscache> Copied: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml (from rev 8761, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,40 @@ +<!-- + ~ 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. + --> + +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> + <sync /> + </clustering> + + <!-- Eviction configuration --> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" + eventQueueSize="1000000"> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="60000"/> + </default> + </eviction> +</jbosscache> Copied: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config_portal-system.xml (from rev 8763, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config_portal-system.xml) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config_portal-system.xml (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config_portal-system.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,40 @@ +<!-- + ~ 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. + --> + +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> + <sync /> + </clustering> + + <!-- Eviction configuration --> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" + eventQueueSize="1000000"> + <property name="maxNodes" value="300000"/> + <property name="timeToLive" value="60000"/> + </default> + </eviction> +</jbosscache> Deleted: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,42 +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. - --> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> - - <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> - - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> - - <!-- Enable batching --> - <invocationBatching enabled="true" /> - - <!-- Eviction configuration --> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" - actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" - eventQueueSize="1000000"> - <property name="maxNodes" value="5000"/> - <property name="minTimeToLive" value="20000"/> - </default> - </eviction> - - <!-- Disable exposure of jmx stats for anonymous caches --> - <jmxStatistics enabled="false"/> - -</jbosscache> Copied: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml (from rev 8761, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,42 @@ +<!-- + ~ 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. + --> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> + + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> + + <!-- Enable batching --> + <invocationBatching enabled="true" /> + + <!-- Eviction configuration --> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" + eventQueueSize="1000000"> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="60000"/> + </default> + </eviction> + + <!-- Disable exposure of jmx stats for anonymous caches --> + <jmxStatistics enabled="false"/> + +</jbosscache> Copied: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config_portal-system.xml (from rev 8763, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config_portal-system.xml) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config_portal-system.xml (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config_portal-system.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,39 @@ +<!-- + ~ 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. + --> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> + + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> + + <!-- Enable batching --> + <invocationBatching enabled="true" /> + + <!-- Eviction configuration --> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" + eventQueueSize="1000000"> + <property name="maxNodes" value="300000"/> + <property name="timeToLive" value="60000"/> + </default> + </eviction> + +</jbosscache> Deleted: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,239 +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. - ---> - -<repository-service default-repository="repository"> - <repositories> - <repository name="repository" system-workspace="${gatein.jcr.workspace.system}" default-workspace="${gatein.jcr.workspace.default}"> - <security-domain>${portal.container.realm}</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - - <!-- System --> - <workspaces> - <workspace name="system"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/system${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/system${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="${gatein.jcr.index.data.dir}/system${container.name.suffix}"/> - <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> - </properties> - </lock-manager> - </workspace> - - <!-- Portal system data --> - <workspace name="portal-system"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/portal-system${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-system${container.name.suffix}"/> - <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> - </properties> - </lock-manager> - </workspace> - - <!-- Portal work data --> - <workspace name="portal-work"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> - <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> - <property name="multi-db" value="false"/> - <property name="update-storage" value="true"/> - <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-work${container.name.suffix}"/> - </properties> - <value-storages> - <value-storage id="portal-work" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="${gatein.jcr.storage.data.dir}/portal-work${container.name.suffix}"/> - </properties> - <filters> - <filter property-type="Binary"/> - </filters> - </value-storage> - </value-storages> - </container> - <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured"/> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> - </properties> - </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> - <properties> - <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-work${container.name.suffix}"/> - <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> - <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> - <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> - <properties> - <property name="time-out" value="15m" /> - <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> - <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="false" /> - <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> - <property name="jbosscache-shareable" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> - <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> - <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> - <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> - <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> - <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> - <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> - </properties> - </lock-manager> - </workspace> - </workspaces> - </repository> - </repositories> -</repository-service> Copied: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml (from rev 8761, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,239 @@ +<!-- + + 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. + +--> + +<repository-service default-repository="repository"> + <repositories> + <repository name="repository" system-workspace="${gatein.jcr.workspace.system}" default-workspace="${gatein.jcr.workspace.default}"> + <security-domain>${portal.container.realm}</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + + <!-- System --> + <workspaces> + <workspace name="system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/system${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> + </workspace> + + <!-- Portal system data --> + <workspace name="portal-system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/portal-system${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config.workspace.portal-system}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> + </workspace> + + <!-- Portal work data --> + <workspace name="portal-work"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/> + <property name="dialect" value="${gatein.jcr.datasource.dialect}"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-work${container.name.suffix}"/> + </properties> + <value-storages> + <value-storage id="portal-work" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.jcr.storage.data.dir}/portal-work${container.name.suffix}"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-work${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> + </workspace> + </workspaces> + </repository> + </repositories> +</repository-service> Deleted: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,148 +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. - */ - -import org.exoplatform.webui.core.model.SelectItemCategory ; -import org.exoplatform.webui.core.model.SelectItemOption ; - - List templates = new ArrayList() ; - - SelectItemCategory row = new SelectItemCategory("row") ; - row.addSelectItemOption(new SelectItemOption("oneRow", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>", - "OneRowContainerLayout")); - - row.addSelectItemOption(new SelectItemOption("twoRows", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - "</container>", - "TwoRowContainerLayout")) ; - row.addSelectItemOption(new SelectItemOption("threeRows", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - "</container>", - "ThreeRowContainerLayout")); - templates.add(row); - - SelectItemCategory column = new SelectItemCategory("column") ; - column.addSelectItemOption(new SelectItemOption("oneColumns","" + - "<container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + - " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - "</container>", - "OneRowContainerLayout")) ; - column.addSelectItemOption(new SelectItemOption("twoColumns", - "<container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + - " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - "</container>", - "TwoColumnContainerLayout")) ; - column.addSelectItemOption(new SelectItemOption("threeColumns", - "<container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + - " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - "</container>", - "ThreeColumnContainerLayout")) ; - templates.add(column); - - SelectItemCategory autofitColumn = new SelectItemCategory("autofitColumn") ; - autofitColumn.addSelectItemOption(new SelectItemOption("autofitOneColumns","" + - "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" + - " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - "</container>", - "OneRowContainerLayout")) ; - autofitColumn.addSelectItemOption(new SelectItemOption("autofitTwoColumns", - "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" + - " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - "</container>", - "TwoColumnContainerLayout")) ; - autofitColumn.addSelectItemOption(new SelectItemOption("autofitThreeColumns", - "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" + - " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + - "</container>", - "ThreeColumnContainerLayout")) ; - templates.add(autofitColumn); - - SelectItemCategory tabs = new SelectItemCategory("tabs") ; - tabs.addSelectItemOption(new SelectItemOption("twoTabs", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - "<container template=\"system:/groovy/portal/webui/container/UITabContainer.gtmpl\">" + - " <factory-id>TabContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - "</container>" + - "</container>", - "TwoTabContainerLayout")) ; - tabs.addSelectItemOption(new SelectItemOption("threeTabs", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - "<container template=\"system:/groovy/portal/webui/container/UITabContainer.gtmpl\">" + - " <factory-id>TabContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - "</container>" + - "</container>", - "ThreeTabContainerLayout")) ; - templates.add(tabs); - - SelectItemCategory mixed = new SelectItemCategory("mix") ; - mixed.addSelectItemOption(new SelectItemOption("twoColumnsOneRow", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " </container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - "</container>", - "TwoColumnOneRowContainerLayout")) ; - mixed.addSelectItemOption(new SelectItemOption("oneRowTwoColumns", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + - " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " </container>" + - "</container>", - "OneRowTwoColumnContainerLayout")) ; - mixed.addSelectItemOption(new SelectItemOption("oneRow2Column1Row", - "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + - " <factory-id>TableColumnContainer</factory-id>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - " </container>" + - " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + - "</container>", - "OneRow2Column1RowContainerLayout")) ; - templates.add(mixed); - -return templates; Copied: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy (from rev 8764, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,148 @@ +/** + * 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. + */ + +import org.exoplatform.webui.core.model.SelectItemCategory ; +import org.exoplatform.webui.core.model.SelectItemOption ; + + List templates = new ArrayList() ; + + SelectItemCategory row = new SelectItemCategory("row") ; + row.addSelectItemOption(new SelectItemOption("oneRow", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>", + "OneRowContainerLayout")); + + row.addSelectItemOption(new SelectItemOption("twoRows", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + "</container>", + "TwoRowContainerLayout")) ; + row.addSelectItemOption(new SelectItemOption("threeRows", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + "</container>", + "ThreeRowContainerLayout")); + templates.add(row); + + SelectItemCategory column = new SelectItemCategory("column") ; + column.addSelectItemOption(new SelectItemOption("oneColumns","" + + "<container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + "</container>", + "OneRowContainerLayout")) ; + column.addSelectItemOption(new SelectItemOption("twoColumns", + "<container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + "</container>", + "TwoColumnContainerLayout")) ; + column.addSelectItemOption(new SelectItemOption("threeColumns", + "<container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + "</container>", + "ThreeColumnContainerLayout")) ; + templates.add(column); + + SelectItemCategory autofitColumn = new SelectItemCategory("autofitColumn") ; + autofitColumn.addSelectItemOption(new SelectItemOption("autofitOneColumns","" + + "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + "</container>", + "OneRowContainerLayout")) ; + autofitColumn.addSelectItemOption(new SelectItemOption("autofitTwoColumns", + "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + "</container>", + "TwoColumnContainerLayout")) ; + autofitColumn.addSelectItemOption(new SelectItemOption("autofitThreeColumns", + "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIColumnContainer.gtmpl\"><factory-id>ColumnContainer</factory-id></container>" + + "</container>", + "ThreeColumnContainerLayout")) ; + templates.add(autofitColumn); + + SelectItemCategory tabs = new SelectItemCategory("tabs") ; + tabs.addSelectItemOption(new SelectItemOption("twoTabs", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + "<container template=\"system:/groovy/portal/webui/container/UITabContainer.gtmpl\">" + + " <factory-id>TabContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + "</container>" + + "</container>", + "TwoTabContainerLayout")) ; + tabs.addSelectItemOption(new SelectItemOption("threeTabs", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + "<container template=\"system:/groovy/portal/webui/container/UITabContainer.gtmpl\">" + + " <factory-id>TabContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + "</container>" + + "</container>", + "ThreeTabContainerLayout")) ; + templates.add(tabs); + + SelectItemCategory mixed = new SelectItemCategory("mix") ; + mixed.addSelectItemOption(new SelectItemOption("twoColumnsOneRow", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " </container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + "</container>", + "TwoColumnOneRowContainerLayout")) ; + mixed.addSelectItemOption(new SelectItemOption("oneRowTwoColumns", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " </container>" + + "</container>", + "OneRowTwoColumnContainerLayout")) ; + mixed.addSelectItemOption(new SelectItemOption("oneRow2Column1Row", + "<container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\">" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl\">" + + " <factory-id>TableColumnContainer</factory-id>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + " </container>" + + " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" + + "</container>", + "OneRow2Column1RowContainerLayout")) ; + templates.add(mixed); + +return templates; \ No newline at end of file Deleted: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,101 +0,0 @@ -<% - import org.exoplatform.commons.utils.ExpressionUtil; - import org.exoplatform.portal.webui.workspace.UIPortalApplication; - //import org.exoplatform.webui.config.Event; - - def rcontext = _ctx.getRequestContext(); - ResourceBundle res = rcontext.getApplicationResourceBundle(); - - UIPortalApplication uiPortalApp = rcontext.getUIApplication(); - boolean hasPermission = uicomponent.hasPermission(); - if(!uiPortalApp.isEditing() && !hasPermission) return; - - String cssStyle = ""; - String uiComponentWidth = uicomponent.getWidth(); - String uiComponentHeight = uicomponent.getHeight(); - if(uiComponentWidth != null || uiComponentHeight != null) cssStyle = "style=\""; - if(uiComponentHeight != null) cssStyle += "height: "+uiComponentHeight+";" - if(cssStyle.length() > 0) cssStyle += "\""; - - /** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */ - String componentId = uicomponent.getId(); - if(componentId.startsWith("UIContainer-")){ - uicomponent.setId(componentId.substring("UIContainer-".length())); - } -%> - -<div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"": "ProtectedContainer"%>" - id="${uicomponent.id}" ${cssStyle} - onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" - onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> - <div class="NormalContainerBlock"> - <div class="LeftContainerBlock"> - <div class="RightContainerBlock UIComponentBlock"> - - <% - int portalMode = uiPortalApp.getModeState(); - if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE){ - %> - <div class="LAYOUT-CONTAINER LAYOUT-BLOCK"> - <%} else {%> - <div class="VIEW-CONTAINER VIEW-BLOCK"> - <%} %> - <%if(hasPermission) {%> - <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> - <div> - <% - System.out.print("\n\n\n\n\n\nRun first render \n\n\n\n\n"); - uicomponent.renderChildren(); - System.out.print("\n\n\n\n\n\nRun after render\n\n\n\n\n"); - %> - - </div> - </div> - <%} else out.print("<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>");%> - </div> - - <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> - <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;"> - <div style="position: relative;"> - <div style="position: absolute; top: -86px;"> - - <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> - <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;"> - <%/*Begin InfoBar*/%> - <div class="UIInfoBar"> - <div class="BlueRoundedStyle"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="FixHeight ClearFix"> - <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div> - <% - String strTitle = uicomponent.getTitle() != null ? - ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : - _ctx.appRes("UIContainer.title.Container"); - %> - <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> - <%if(hasPermission) {%> - <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a> - <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a> - <%}%> - - </div> - </div> - </div> - </div> - </div> - </div> - <%/*End InfoBar*/ %> - </div> - - </div> - </div> - </div> - <%} %> - - </div> - </div> - </div> -</div> - Copied: epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl (from rev 8764, epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/web/portal/src/main/webapp/groovy/portal/webui/container/UIColumnContainer.gtmpl 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,103 @@ +<% + import org.exoplatform.commons.utils.ExpressionUtil; + import org.exoplatform.portal.webui.workspace.UIPortalApplication; + import org.exoplatform.webui.core.UIComponent; + //import org.exoplatform.webui.config.Event; + + def rcontext = _ctx.getRequestContext(); + ResourceBundle res = rcontext.getApplicationResourceBundle(); + + UIPortalApplication uiPortalApp = rcontext.getUIApplication(); + boolean hasPermission = uicomponent.hasPermission(); + if(!uiPortalApp.isEditing() && !hasPermission) return; + + String cssStyle = ""; + String uiComponentWidth = uicomponent.getWidth(); + String uiComponentHeight = uicomponent.getHeight(); + if(uiComponentWidth != null || uiComponentHeight != null) cssStyle = "style=\""; + if(uiComponentHeight != null) cssStyle += "height: "+uiComponentHeight+";" + if(cssStyle.length() > 0) cssStyle += "\""; + + /** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */ + String componentId = uicomponent.getId(); + if(componentId.startsWith("UIContainer-")){ + uicomponent.setId(componentId.substring("UIContainer-".length())); + } +%> + +<div class="UIContainer UIColumnContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"": "ProtectedContainer"%>" + id="${uicomponent.id}" ${cssStyle} + onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" + onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);"> + <div class="NormalContainerBlock UIComponentBlock"> + + <% + int portalMode = uiPortalApp.getModeState(); + if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == UIPortalApplication.APP_BLOCK_EDIT_MODE){ + %> + <div class="LAYOUT-CONTAINER LAYOUT-BLOCK"> + <%} else {%> + <div class="VIEW-CONTAINER VIEW-BLOCK"> + <%} %> + <%if(hasPermission) {%> + <div> + <div class="UIRowContainer <%=(portalMode != UIPortalApplication.NORMAL_MODE && uicomponent.getChildren().size() == 0) ? "EmptyContainer" : ""%>"> + <%uicomponent.renderChildren();%> + </div> + </div> + <%} else out.print("<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>");%> + </div> + + <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> + <div class="EDITION-BLOCK EDITION-CONTAINER" style="position: relative; display: none;"> + + <div style="position: absolute; top: -86px;"> + + <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div> + <div class="CONTROL-CONTAINER CONTROL-BLOCK UIInfoBar" style="position: absolute; top: -6px;"> + <%/*Begin InfoBar*/%> + <div class="BlueRoundedStyle FixHeight ClearFix"> + + <span class="DragControlArea" title="<%=_ctx.appRes("UIColumnContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"></span> + <% + String showCategory = "eXo.webui.UIPopupSelectCategory.show(this, event)"; + String strTitle = uicomponent.getTitle() != null ? + ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) : + _ctx.appRes("UIColumnContainer.title.Container"); + %> + <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div> + <%if(hasPermission) {%> + <div class="ControlIcon ArrowDownIcon" onclick="$showCategory" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertColumn") %>"> + <% /*Begin Popup Menu*/ %> + <div style="position: relative; width: 100%"> + <div class="UIPopupCategory" style="display: none;"> + <div class="PopupCategoryDecorator"> + + <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_BEFORE) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertLeft") %>"> + <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertLeft") %></div> + </a> + <a class="CategoryItem" href="<%= uicomponent.event("InsertColumn", org.exoplatform.portal.webui.container.UIColumnContainer.INSERT_AFTER) %>" title="<%= _ctx.appRes("UIColumnContainer.tooltip.insertRight") %>"> + <div class="CategoryItemLabel"><%= _ctx.appRes("UIColumnContainer.label.insertRight") %></div> + </a> + + </div> + </div> + </div> + <% /*End Popup Menu*/ %> + </div> + <a href="<%=uicomponent.event("EditContainer")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.editContainer")%>"><span></span></a> + <a href="<%=uicomponent.event("DeleteComponent")%>" class="DeleteIcon" title="<%=_ctx.appRes("UIColumnContainer.tooltip.closeContainer")%>"><span></span></a> + + <%}%> + + </div> + <%/*End InfoBar*/ %> + </div> + + </div> + + </div> + <%} %> + + </div> +</div> Modified: epp/portal/tags/EPP_5_2_2_ER01/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/web/rest/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/core/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/dashboard/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/eXo/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/framework/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Deleted: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2003-2010 eXo Platform SAS. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see<http://www.gnu.org/licenses/>;. - */ -package org.exoplatform.portal.webui.container; - -import org.exoplatform.portal.webui.container.UIContainerActionListener.EditContainerActionListener; -import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.DeleteComponentActionListener; -import org.exoplatform.webui.config.annotation.ComponentConfig; -import org.exoplatform.webui.config.annotation.EventConfig; - -/** - * Created by The eXo Platform SAS - * Author : Nguyen Duc Khoi - * khoi.nguyen(a)exoplatform.com - * Jun 1, 2010 - */ - -@ComponentConfig( events = { - @EventConfig(listeners = EditContainerActionListener.class), - @EventConfig(listeners = DeleteComponentActionListener.class) -}) -public class UIColumnContainer extends UIContainer -{ - public static final String COLUMN_CONTAINER = "ColumnContainer"; - public static final String COLUMN_CONTAINER_TEMPLATE = "system:/groovy/portal/webui/container/UIColumnContainer.gtmpl"; - - public UIColumnContainer() - { - super(); - } -} Copied: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java (from rev 8764, epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,108 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.webui.container; + +import java.util.Collections; +import java.util.List; + +import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.webui.container.UIContainerActionListener.EditContainerActionListener; +import org.exoplatform.portal.webui.portal.UIPortalComponent; +import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.DeleteComponentActionListener; +import org.exoplatform.portal.webui.util.Util; +import org.exoplatform.portal.webui.workspace.UIPortalApplication; +import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace; +import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.config.annotation.EventConfig; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; + +/** + * Created by The eXo Platform SAS + * Author : Nguyen Duc Khoi + * khoi.nguyen(a)exoplatform.com + * Jul 29, 2010 + */ + +@ComponentConfig(template = "system:/groovy/portal/webui/container/UIColumnContainer.gtmpl", events = +{ + @EventConfig(listeners = UIColumnContainer.InsertColumnActionListener.class), + @EventConfig(listeners = DeleteComponentActionListener.class, confirm = "UIColumnContainer.deleteColumnContainer"), + @EventConfig(listeners = EditContainerActionListener.class)}) +public class UIColumnContainer extends UIContainer +{ + public static final String COLUMN_CONTAINER = "ColumnContainer"; + + public static final String INSERT_AFTER = "insertColumnAfter"; + + public static final String INSERT_BEFORE = "insertColumnBefore"; + + public UIColumnContainer() + { + super(); + } + + public static class InsertColumnActionListener extends EventListener<UIColumnContainer> + { + @Override + public void execute(Event<UIColumnContainer> event) throws Exception + { + String insertPosition = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); + UIColumnContainer uiSelectedColumn = event.getSource(); + UIPortalComponent uiParent = (UIPortalComponent) uiSelectedColumn.getParent(); + if (insertPosition.equals(INSERT_AFTER)) + { + UIColumnContainer.insertColumn(uiSelectedColumn, true); + } + else if (insertPosition.equals(INSERT_BEFORE)) + { + UIColumnContainer.insertColumn(uiSelectedColumn, false); + } + + Util.showComponentLayoutMode(uiSelectedColumn.getClass()); + + PortalRequestContext pcontext = (PortalRequestContext) event.getRequestContext(); + UIPortalApplication uiPortalApp = uiParent.getAncestorOfType(UIPortalApplication.class); + UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); + pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); + pcontext.ignoreAJAXUpdateOnPortlets(true); + } + + } + + private static void insertColumn(UIColumnContainer selectedColumn, boolean isInsertAfter) throws Exception + { + UIContainer uiParent = selectedColumn.getParent(); + UIColumnContainer uiNewColumn = uiParent.addChild(UIColumnContainer.class, null, null); + + uiNewColumn.setTemplate(selectedColumn.getTemplate()); + uiNewColumn.setFactoryId(selectedColumn.getFactoryId()); + uiNewColumn.setId(String.valueOf(uiNewColumn.hashCode())); + + List<UIComponent> listColumn = uiParent.getChildren(); + int position = listColumn.indexOf(selectedColumn); + if (isInsertAfter) + { + position += 1; + } + Collections.rotate(listColumn.subList(position, listColumn.size()), 1); + } + +} \ No newline at end of file Deleted: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,77 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.webui.container; - -import org.exoplatform.portal.webui.portal.UIPortalComponent; -import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.DeleteComponentActionListener; -import org.exoplatform.webui.config.annotation.ComponentConfig; -import org.exoplatform.webui.config.annotation.EventConfig; - -/** - * May 19, 2006 - */ -@ComponentConfig(events = {@EventConfig(listeners = UIContainerActionListener.EditContainerActionListener.class), - @EventConfig(listeners = DeleteComponentActionListener.class, confirm = "UIContainer.deleteContainer")}) -public class UIContainer extends UIPortalComponent -{ - public static final String TABLE_COLUMN_CONTAINER = "TableColumnContainer"; - public static final String CONTAINER_TEMPLATE = "system:/groovy/portal/webui/container/UIContainer.gtmpl"; - - /** Storage id. */ - private String storageId; - - protected String icon; - - protected String description; - - public UIContainer() - { - } - - public String getStorageId() - { - return storageId; - } - - public void setStorageId(String storageId) - { - this.storageId = storageId; - } - - public String getIcon() - { - return icon; - } - - public void setIcon(String s) - { - icon = s; - } - - public String getDescription() - { - return description; - } - - public void setDescription(String desc) - { - this.description = desc; - } -} Copied: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java (from rev 8764, epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainer.java 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,76 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.container; + +import org.exoplatform.portal.webui.portal.UIPortalComponent; +import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.DeleteComponentActionListener; +import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.config.annotation.EventConfig; + +/** + * May 19, 2006 + */ +@ComponentConfig(events = {@EventConfig(listeners = UIContainerActionListener.EditContainerActionListener.class), + @EventConfig(listeners = DeleteComponentActionListener.class, confirm = "UIContainer.deleteContainer")}) +public class UIContainer extends UIPortalComponent +{ + public static final String TABLE_COLUMN_CONTAINER = "TableColumnContainer"; + + /** Storage id. */ + private String storageId; + + protected String icon; + + protected String description; + + public UIContainer() + { + } + + public String getStorageId() + { + return storageId; + } + + public void setStorageId(String storageId) + { + this.storageId = storageId; + } + + public String getIcon() + { + return icon; + } + + public void setIcon(String s) + { + icon = s; + } + + public String getDescription() + { + return description; + } + + public void setDescription(String desc) + { + this.description = desc; + } +} Deleted: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,588 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.webui.portal; - -import org.exoplatform.application.registry.Application; -import org.exoplatform.portal.application.PortalRequestContext; -import org.exoplatform.portal.config.DataStorage; -import org.exoplatform.portal.config.UserACL; -import org.exoplatform.portal.config.UserPortalConfigService; -import org.exoplatform.portal.config.model.ApplicationState; -import org.exoplatform.portal.config.model.ApplicationType; -import org.exoplatform.portal.config.model.CloneApplicationState; -import org.exoplatform.portal.config.model.Container; -import org.exoplatform.portal.config.model.TransientApplicationState; -import org.exoplatform.portal.mop.SiteType; -import org.exoplatform.portal.webui.application.PortletState; -import org.exoplatform.portal.webui.application.UIPortlet; -import org.exoplatform.portal.webui.container.UIColumnContainer; -import org.exoplatform.portal.webui.container.UITabContainer; -import org.exoplatform.portal.webui.login.UILogin; -import org.exoplatform.portal.webui.login.UIResetPassword; -import org.exoplatform.portal.webui.page.UIPage; -import org.exoplatform.portal.webui.page.UIPageBody; -import org.exoplatform.portal.webui.util.PortalDataMapper; -import org.exoplatform.portal.webui.util.Util; -import org.exoplatform.portal.webui.workspace.UIEditInlineWorkspace; -import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; -import org.exoplatform.portal.webui.workspace.UIPortalApplication; -import org.exoplatform.portal.webui.workspace.UIPortalToolPanel; -import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace; -import org.exoplatform.services.organization.OrganizationService; -import org.exoplatform.services.organization.User; -import org.exoplatform.web.application.ApplicationMessage; -import org.exoplatform.web.application.JavascriptManager; -import org.exoplatform.web.security.GateInToken; -import org.exoplatform.web.security.security.RemindPasswordTokenService; -import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.webui.core.UIComponent; -import org.exoplatform.webui.core.UIContainer; -import org.exoplatform.webui.core.UITabPane; -import org.exoplatform.webui.event.Event; -import org.exoplatform.webui.event.EventListener; - -import java.util.List; - -import javax.faces.component.UIColumn; - -/** Author : Nhu Dinh Thuan nhudinhthuan(a)yahoo.com Jun 14, 2006 */ -public class UIPortalComponentActionListener -{ - private final static String UI_PORTLET_PREFIX = "UIPortlet-"; - - static public class ViewChildActionListener extends EventListener<UIContainer> - { - public void execute(Event<UIContainer> event) throws Exception - { - UIContainer uiContainer = event.getSource(); - String id = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); - uiContainer.setRenderedChild(id); - } - } - - static public class ShowLoginFormActionListener extends EventListener<UIPortalComponent> - { - public void execute(Event<UIPortalComponent> event) throws Exception - { - UIPortal uiPortal = Util.getUIPortal(); - UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); - UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - UILogin uiLogin = uiMaskWS.createUIComponent(UILogin.class, null, null); - uiMaskWS.setUIComponent(uiLogin); - uiMaskWS.setWindowSize(630, -1); - event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); - } - } - - static public class DeleteComponentActionListener extends EventListener<UIComponent> - { - public void execute(Event<UIComponent> event) throws Exception - { - UIComponent uiComponentTobeRemoved = event.getSource(); - String id = uiComponentTobeRemoved.getId(); - UIPortalApplication uiApp = Util.getUIPortalApplication(); - if (uiComponentTobeRemoved.findFirstComponentOfType(UIPageBody.class) != null) - { - uiApp.addMessage(new ApplicationMessage("UIPortalApplication.msg.deletePageBody", new Object[]{}, - ApplicationMessage.WARNING)); - return; - } - - UIPortalComposer portalComposer = uiApp.findFirstComponentOfType(UIPortalComposer.class); - portalComposer.setEditted(true); - - UIPage uiPage = uiComponentTobeRemoved.getAncestorOfType(UIPage.class); - if (uiPage != null && uiPage.getMaximizedUIPortlet() != null) - { - if (id.equals(uiPage.getMaximizedUIPortlet().getId())) - { - uiPage.setMaximizedUIPortlet(null); - } - } - else - { - UIPortal uiPortal = Util.getUIPortal(); - if (uiPortal != null && uiPortal.getMaximizedUIComponent() != null) - { - if (id.equals(uiPortal.getMaximizedUIComponent().getId())) - { - uiPortal.setMaximizedUIComponent(null); - } - } - else - { - UIPageBody uiPageBody = uiPortal.findFirstComponentOfType(UIPageBody.class); - if (uiPageBody != null && uiPageBody.getMaximizedUIComponent() != null) - { - if (id.equals(uiPageBody.getMaximizedUIComponent().getId())) - { - uiPageBody.setMaximizedUIComponent(null); - } - } - } - } - Util.showComponentLayoutMode(uiComponentTobeRemoved.getClass()); - - PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); - - org.exoplatform.portal.webui.container.UIContainer uiParent = uiComponentTobeRemoved.getParent(); - if (UITabContainer.TAB_CONTAINER.equals(uiParent.getFactoryId())) - { - /* - * Check if it is removing the last tab then we will remove the TabContainer as well - * - * Indeed, a TabContainer is nested into a normal container so - * we should remove the its parent instead of itself when we delete the last tab - */ - if (uiParent.getChildren().size() == 1) - { - UIContainer uiTabParent = uiParent.getParent(); - if(uiTabParent.getChildren().size() > 1) - { - uiComponentTobeRemoved = uiParent; - } - else - { - uiComponentTobeRemoved = uiTabParent; - } - } - else - { - removeUIComponent(uiComponentTobeRemoved, pcontext, true); - return; - } - } - else if (org.exoplatform.portal.webui.container.UIContainer.TABLE_COLUMN_CONTAINER.equals(uiParent.getFactoryId())) - { - if (uiParent.getChildren().size() == 1) - { - uiComponentTobeRemoved = uiParent; - } - } - - removeUIComponent(uiComponentTobeRemoved, pcontext, false); - } - - } - - /** - * Remove an UIComponent from server side and - * adding removing behaviors in javascript to clients if necessary - */ - private static void removeUIComponent(UIComponent uiComponent, PortalRequestContext pcontext, boolean isUpdate) - { - UIContainer uiParent = uiComponent.getParent(); - uiParent.getChildren().remove(uiComponent); - - JavascriptManager jsManager = pcontext.getJavascriptManager(); - if(isUpdate) { - pcontext.addUIComponentToUpdateByAjax(uiParent); - } else { - StringBuffer buffer = new StringBuffer(); - buffer.append("eXo.portal.UIPortal.removeComponent('"); - if (uiComponent instanceof UIPortlet) - { - buffer.append(UI_PORTLET_PREFIX); - } - buffer.append(uiComponent.getId()); - buffer.append("');"); - jsManager.addJavascript(buffer.toString()); - } - jsManager.addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); - } - - static public class MoveChildActionListener extends EventListener<UIContainer> - { - public void execute(Event<UIContainer> event) throws Exception - { - PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); - String insertPosition = pcontext.getRequestParameter("insertPosition"); - int position = -1; - try - { - position = Integer.parseInt(insertPosition); - } - catch (Exception exp) - { - position = -1; - } - - boolean newComponent = false; - String paramNewComponent = pcontext.getRequestParameter("isAddingNewly"); - - if (paramNewComponent != null) - newComponent = Boolean.valueOf(paramNewComponent).booleanValue(); - - UIPortalApplication uiApp = event.getSource().getAncestorOfType(UIPortalApplication.class); - UIPortalComposer portalComposer = uiApp.findFirstComponentOfType(UIPortalComposer.class); - - if (newComponent) - { - portalComposer.updateWorkspaceComponent(); - pcontext.ignoreAJAXUpdateOnPortlets(true); - } - - UIWorkingWorkspace uiWorkingWS = uiApp.getChild(UIWorkingWorkspace.class); - UIComponent uiWorking = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class); - if (!uiWorking.isRendered()) - { - UIEditInlineWorkspace uiEditWS = uiWorkingWS.getChild(UIEditInlineWorkspace.class); - uiWorking = uiEditWS.getUIComponent(); - } - - String sourceId = pcontext.getRequestParameter("srcID"); - UIComponent uiSource = uiWorking.findComponentById(sourceId); - - UIContainer uiTarget = uiWorking.findComponentById(pcontext.getRequestParameter("targetID")); - if (position < 0 && uiTarget.getChildren().size() > 0) - { - position = uiTarget.getChildren().size(); - } - else if (position < 0) - { - position = 0; - } - - if (uiSource == null) - { - UITabPane subTabPane = portalComposer.getChild(UITabPane.class); - UIContainerList uiContainerConfig = subTabPane.getChild(UIContainerList.class); - if (uiContainerConfig != null && subTabPane.getSelectedTabId().equals(uiContainerConfig.getId())) - { - org.exoplatform.portal.webui.container.UIContainer uiContainer = - uiTarget.createUIComponent(org.exoplatform.portal.webui.container.UIContainer.class, null, null); - Container container = uiContainerConfig.getContainer(sourceId); - container.setId(String.valueOf(container.hashCode())); - uiContainer.setStorageId(container.getStorageId()); - PortalDataMapper.toUIContainer(uiContainer, container); - String[] accessPers = uiContainer.getAccessPermissions(); - for (String accessPer : accessPers) - { - if (accessPer.equals("")) - accessPer = null; - } - if (accessPers == null || accessPers.length == 0) - accessPers = new String[]{UserACL.EVERYONE}; - uiContainer.setAccessPermissions(accessPers); - uiSource = uiContainer; - if(org.exoplatform.portal.webui.container.UIContainer.TABLE_COLUMN_CONTAINER.equals(((org.exoplatform.portal.webui.container.UIContainer)uiTarget).getFactoryId()) && uiSource instanceof org.exoplatform.portal.webui.container.UIContainer) - { - ((org.exoplatform.portal.webui.container.UIContainer)uiSource).setTemplate(UIColumnContainer.COLUMN_CONTAINER_TEMPLATE); - } - } - else - { - Application app = null; - UIApplicationList appList = uiApp.findFirstComponentOfType(UIApplicationList.class); - app = appList.getApplication(sourceId); - ApplicationType applicationType = app.getType(); - - // - UIPortlet uiPortlet = uiTarget.createUIComponent(UIPortlet.class, null, null); - if (app.getDisplayName() != null) - { - uiPortlet.setTitle(app.getDisplayName()); - } - else if (app.getApplicationName() != null) - { - uiPortlet.setTitle(app.getApplicationName()); - } - uiPortlet.setDescription(app.getDescription()); - List<String> accessPersList = app.getAccessPermissions(); - String[] accessPers = accessPersList.toArray(new String[accessPersList.size()]); - for (String accessPer : accessPers) - { - if (accessPer.equals("")) - accessPers = null; - } - if (accessPers == null || accessPers.length == 0) - accessPers = new String[]{UserACL.EVERYONE}; - uiPortlet.setAccessPermissions(accessPers); - UIPage uiPage = uiTarget.getAncestorOfType(UIPage.class); - - // Hardcode on state to fix error while drag/drop Dashboard - if ("dashboard/DashboardPortlet".equals(app.getContentId())) - { - TransientApplicationState state = new TransientApplicationState<Object>(app.getContentId()); - uiPortlet.setState(new PortletState(state, applicationType)); - } - else - { - ApplicationState state; - // if we have a new portlet added to the page we need for it to have its own state. - // otherwise all new portlets added to a page will have the same state. - if (newComponent) - { - state = new TransientApplicationState<Object>(app.getContentId()); - } - // if the portlet is not new, then we should clone it from the original portlet - else - { - state = new CloneApplicationState<Object>(app.getStorageId()); - } - uiPortlet.setState(new PortletState(state, applicationType)); - } - uiPortlet.setPortletInPortal(uiTarget instanceof UIPortal); - uiPortlet.setShowEditControl(true); - - //TODO Wait to fix issue EXOGTN-213 and then - //we should get "showInfobar" from current UI portal instead of Storage service - UIPortal currentPortal = Util.getUIPortal(); - DataStorage storage = uiApp.getApplicationComponent(DataStorage.class); - uiPortlet.setShowInfoBar(storage.getPortalConfig(currentPortal.getSiteKey().getTypeName(), currentPortal.getSiteKey().getName()).isShowInfobar()); - uiSource = uiPortlet; - if (org.exoplatform.portal.webui.container.UIContainer.TABLE_COLUMN_CONTAINER.equals(((org.exoplatform.portal.webui.container.UIContainer)uiTarget).getFactoryId())) - { - - org.exoplatform.portal.webui.container.UIContainer uiWraper = this.createContainerWraper(uiSource, uiTarget); - List<UIComponent> children = uiTarget.getChildren(); - uiWraper.setTemplate(UIColumnContainer.COLUMN_CONTAINER_TEMPLATE); - uiWraper.setParent(uiTarget); - children.add(position, uiWraper); - return; - } - } - List<UIComponent> children = uiTarget.getChildren(); - uiSource.setParent(uiTarget); - children.add(position, uiSource); - return; - } - - org.exoplatform.portal.webui.container.UIContainer uiParent = uiSource.getParent(); - if (uiParent == uiTarget) - { - int currentIdx = uiTarget.getChildren().indexOf(uiSource); - if (position <= currentIdx) - { - uiTarget.getChildren().add(position, uiSource); - currentIdx++; - uiTarget.getChildren().remove(currentIdx); - return; - } - uiTarget.getChildren().remove(currentIdx); - if (position >= uiTarget.getChildren().size()) - { - position = uiTarget.getChildren().size(); - } - uiTarget.getChildren().add(position, uiSource); - return; - } - - - if (UITabContainer.TAB_CONTAINER.equals(uiParent.getFactoryId())) - { - if (uiParent.getChildren().size() == 1) - { - UIContainer uiTabParent = uiParent.getParent(); - if (uiTabParent.getChildren().size() > 1) - { - removeUIComponent(uiParent, pcontext, false); - } - else - { - removeUIComponent(uiTabParent, pcontext, false); - } - } - else - { - uiParent.getChildren().remove(uiSource); - pcontext.addUIComponentToUpdateByAjax(uiParent); - } - } - else if (org.exoplatform.portal.webui.container.UIContainer.TABLE_COLUMN_CONTAINER.equals(((org.exoplatform.portal.webui.container.UIContainer)uiTarget).factoryId)) - { - portalComposer.updateWorkspaceComponent(); - pcontext.setFullRender(true); - if (uiSource instanceof org.exoplatform.portal.webui.container.UIContainer) - { - ((org.exoplatform.portal.webui.container.UIContainer)uiSource).setTemplate(UIColumnContainer.COLUMN_CONTAINER_TEMPLATE); - ((org.exoplatform.portal.webui.container.UIContainer)uiSource).setFactoryId(UIColumnContainer.COLUMN_CONTAINER); - } - else - { - org.exoplatform.portal.webui.container.UIContainer uiWraper = this.createContainerWraper(uiSource, uiTarget); - List<UIComponent> children = uiTarget.getChildren(); - uiWraper.setTemplate(UIColumnContainer.COLUMN_CONTAINER_TEMPLATE); - uiWraper.setParent(uiTarget); - children.add(position, uiWraper); - uiParent.getChildren().remove(uiSource); - return; - } - uiParent.getChildren().remove(uiSource); - } - else if (org.exoplatform.portal.webui.container.UIContainer.TABLE_COLUMN_CONTAINER.equals(uiParent.getFactoryId())) - { - ((org.exoplatform.portal.webui.container.UIContainer)uiSource).setTemplate("system:/groovy/portal/webui/container/UIContainer.gtmpl"); - ((org.exoplatform.portal.webui.container.UIContainer)uiSource).setFactoryId(null); - - if (uiParent.getChildren().size() == 1) - { - removeUIComponent(uiParent, pcontext, false); - } - else - { - uiParent.getChildren().remove(uiSource); - } - } - - else - { - uiParent.getChildren().remove(uiSource); - } - - uiTarget.getChildren().add(position, uiSource); - uiSource.setParent(uiTarget); - } - - private org.exoplatform.portal.webui.container.UIContainer createContainerWraper(UIComponent uiSource, UIContainer uiParent) throws Exception - { - org.exoplatform.portal.webui.container.UIContainer uiContainer = uiParent.createUIComponent(org.exoplatform.portal.webui.container.UIContainer.class, null, null); - List<UIComponent> children = uiContainer.getChildren(); - if(uiSource instanceof UIPortlet) - { - ((UIPortlet) uiSource).setShowEditControl(true); - } - children.add(uiSource); - uiSource.setParent(uiContainer); - String[] accessPers = uiContainer.getAccessPermissions(); - for (String accessPer : accessPers) - { - if (accessPer.equals("")) - accessPer = null; - } - if (accessPers == null || accessPers.length == 0) - accessPers = new String[]{UserACL.EVERYONE}; - uiContainer.setAccessPermissions(accessPers); - return uiContainer; - } - } - - public static class ChangeLanguageActionListener extends EventListener<UIPortal> - { - - @Override - public void execute(Event<UIPortal> event) throws Exception - { - UIPortal uiPortal = event.getSource(); - UIPortalApplication uiPortalApp = uiPortal.getAncestorOfType(UIPortalApplication.class); - UIMaskWorkspace uiMaskWorkspace = uiPortalApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - uiMaskWorkspace.createUIComponent(UILanguageSelector.class, null, null); - event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace); - } - - } - - public static class RecoveryPasswordAndUsernameActionListener extends EventListener<UIPortal> - { - @Override - public void execute(Event<UIPortal> event) throws Exception - { - UIPortal uiPortal = event.getSource(); - RemindPasswordTokenService tokenService = uiPortal.getApplicationComponent(RemindPasswordTokenService.class); - String tokenId = event.getRequestContext().getRequestParameter("tokenId"); - - WebuiRequestContext requestContext = event.getRequestContext(); - GateInToken token = tokenService.getToken(tokenId); - if (token == null) - { - requestContext.getUIApplication() - .addMessage(new ApplicationMessage("UIForgetPassword.msg.expration", null)); - requestContext.addUIComponentToUpdateByAjax(uiPortal.getParent()); - return; - } - - OrganizationService orgSrc = uiPortal.getApplicationComponent(OrganizationService.class); - // get user - User user = orgSrc.getUserHandler().findUserByName(token.getPayload().getUsername()); - if (user == null) - { - requestContext.getUIApplication() - .addMessage(new ApplicationMessage("UIForgetPassword.msg.user-delete", null)); - return; - } - - UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); - UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - - UIResetPassword uiReset = uiMaskWS.createUIComponent(UIResetPassword.class, null, null); - uiReset.setUser(user); - uiReset.setTokenId(tokenId); - uiMaskWS.setUIComponent(uiReset); - uiMaskWS.setWindowSize(630, -1); - event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); - } - } - - static public class ChangeSkinActionListener extends EventListener<UIPortal> - { - public void execute(Event<UIPortal> event) throws Exception - { - UIPortal uiPortal = event.getSource(); - UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); - UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - - UISkinSelector uiChangeSkin = uiMaskWS.createUIComponent(UISkinSelector.class, null, null); - uiMaskWS.setUIComponent(uiChangeSkin); - uiMaskWS.setWindowSize(640, 400); - uiMaskWS.setShow(true); - event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); - } - } - - static public class ChangeApplicationListActionListener extends EventListener<UIPortal> - { - public void execute(Event<UIPortal> event) throws Exception - { - UIPortal uiPortal = event.getSource(); - UIPortalApplication application = uiPortal.getAncestorOfType(UIPortalApplication.class); - UIPortalComposer composer = application.findFirstComponentOfType(UIPortalComposer.class); - UITabPane uiTabPane = composer.getChild(UITabPane.class); - String appListId = uiTabPane.getChild(UIApplicationList.class).getId(); - uiTabPane.replaceChild(appListId, composer.createUIComponent(UIApplicationList.class, null, null)); - } - } - - public static class EditPortalPropertiesActionListener extends EventListener<UIPortal> - { - public void execute(Event<UIPortal> event) throws Exception - { - String portalName = event.getRequestContext().getRequestParameter("portalName"); - UIPortal uiPortal = Util.getUIPortal(); - UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); - UserPortalConfigService service = uiApp.getApplicationComponent(UserPortalConfigService.class); - PortalRequestContext context = Util.getPortalRequestContext(); - if (portalName != null - && service.getUserPortalConfig(portalName, event.getRequestContext().getRemoteUser()) == null) - { - uiApp.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist", new String[]{portalName})); - context.addUIComponentToUpdateByAjax(uiApp.findFirstComponentOfType(UIWorkingWorkspace.class)); - context.setFullRender(true); - return; - } - - UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); - UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm"); - portalForm.setPortalOwner(portalName); - portalForm.setBindingBean(); - uiMaskWS.setWindowSize(700, -1); - context.addUIComponentToUpdateByAjax(uiMaskWS); - } - } -} Copied: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java (from rev 8764, epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,517 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.portal; + +import org.exoplatform.application.registry.Application; +import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.config.UserACL; +import org.exoplatform.portal.config.UserPortalConfigService; +import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; +import org.exoplatform.portal.config.model.CloneApplicationState; +import org.exoplatform.portal.config.model.Container; +import org.exoplatform.portal.config.model.TransientApplicationState; +import org.exoplatform.portal.mop.SiteType; +import org.exoplatform.portal.webui.application.PortletState; +import org.exoplatform.portal.webui.application.UIPortlet; +import org.exoplatform.portal.webui.container.UITabContainer; +import org.exoplatform.portal.webui.login.UILogin; +import org.exoplatform.portal.webui.login.UIResetPassword; +import org.exoplatform.portal.webui.page.UIPage; +import org.exoplatform.portal.webui.page.UIPageBody; +import org.exoplatform.portal.webui.util.PortalDataMapper; +import org.exoplatform.portal.webui.util.Util; +import org.exoplatform.portal.webui.workspace.UIEditInlineWorkspace; +import org.exoplatform.portal.webui.workspace.UIMaskWorkspace; +import org.exoplatform.portal.webui.workspace.UIPortalApplication; +import org.exoplatform.portal.webui.workspace.UIPortalToolPanel; +import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace; +import org.exoplatform.services.organization.OrganizationService; +import org.exoplatform.services.organization.User; +import org.exoplatform.web.application.ApplicationMessage; +import org.exoplatform.web.application.JavascriptManager; +import org.exoplatform.web.security.GateInToken; +import org.exoplatform.web.security.security.RemindPasswordTokenService; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.core.UIContainer; +import org.exoplatform.webui.core.UITabPane; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; + +import java.util.List; + +/** Author : Nhu Dinh Thuan nhudinhthuan(a)yahoo.com Jun 14, 2006 */ +public class UIPortalComponentActionListener +{ + private final static String UI_PORTLET_PREFIX = "UIPortlet-"; + + static public class ViewChildActionListener extends EventListener<UIContainer> + { + public void execute(Event<UIContainer> event) throws Exception + { + UIContainer uiContainer = event.getSource(); + String id = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); + uiContainer.setRenderedChild(id); + } + } + + static public class ShowLoginFormActionListener extends EventListener<UIPortalComponent> + { + public void execute(Event<UIPortalComponent> event) throws Exception + { + UIPortal uiPortal = Util.getUIPortal(); + UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); + UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); + UILogin uiLogin = uiMaskWS.createUIComponent(UILogin.class, null, null); + uiMaskWS.setUIComponent(uiLogin); + uiMaskWS.setWindowSize(630, -1); + event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); + } + } + + static public class DeleteComponentActionListener extends EventListener<UIComponent> + { + public void execute(Event<UIComponent> event) throws Exception + { + UIComponent uiComponentTobeRemoved = event.getSource(); + String id = uiComponentTobeRemoved.getId(); + UIPortalApplication uiApp = Util.getUIPortalApplication(); + if (uiComponentTobeRemoved.findFirstComponentOfType(UIPageBody.class) != null) + { + uiApp.addMessage(new ApplicationMessage("UIPortalApplication.msg.deletePageBody", new Object[]{}, + ApplicationMessage.WARNING)); + return; + } + + UIPortalComposer portalComposer = uiApp.findFirstComponentOfType(UIPortalComposer.class); + portalComposer.setEditted(true); + + UIPage uiPage = uiComponentTobeRemoved.getAncestorOfType(UIPage.class); + if (uiPage != null && uiPage.getMaximizedUIPortlet() != null) + { + if (id.equals(uiPage.getMaximizedUIPortlet().getId())) + { + uiPage.setMaximizedUIPortlet(null); + } + } + else + { + UIPortal uiPortal = Util.getUIPortal(); + if (uiPortal != null && uiPortal.getMaximizedUIComponent() != null) + { + if (id.equals(uiPortal.getMaximizedUIComponent().getId())) + { + uiPortal.setMaximizedUIComponent(null); + } + } + else + { + UIPageBody uiPageBody = uiPortal.findFirstComponentOfType(UIPageBody.class); + if (uiPageBody != null && uiPageBody.getMaximizedUIComponent() != null) + { + if (id.equals(uiPageBody.getMaximizedUIComponent().getId())) + { + uiPageBody.setMaximizedUIComponent(null); + } + } + } + } + Util.showComponentLayoutMode(uiComponentTobeRemoved.getClass()); + + PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); + + org.exoplatform.portal.webui.container.UIContainer uiParent = uiComponentTobeRemoved.getParent(); + if (UITabContainer.TAB_CONTAINER.equals(uiParent.getFactoryId())) + { + /* + * Check if it is removing the last tab then we will remove the TabContainer as well + * + * Indeed, a TabContainer is nested into a normal container so + * we should remove the its parent instead of itself when we delete the last tab + */ + if (uiParent.getChildren().size() == 1) + { + UIContainer uiTabParent = uiParent.getParent(); + if(uiTabParent.getChildren().size() > 1) + { + uiComponentTobeRemoved = uiParent; + } + else + { + uiComponentTobeRemoved = uiTabParent; + } + } + else + { + removeUIComponent(uiComponentTobeRemoved, pcontext, true); + return; + } + } + else if (org.exoplatform.portal.webui.container.UIContainer.TABLE_COLUMN_CONTAINER.equals(uiParent.getFactoryId())) + { + if (uiParent.getChildren().size() == 1) + { + uiComponentTobeRemoved = uiParent; + } + } + + removeUIComponent(uiComponentTobeRemoved, pcontext, false); + } + + } + + /** + * Remove an UIComponent from server side and + * adding removing behaviors in javascript to clients if necessary + */ + private static void removeUIComponent(UIComponent uiComponent, PortalRequestContext pcontext, boolean isUpdate) + { + UIContainer uiParent = uiComponent.getParent(); + uiParent.getChildren().remove(uiComponent); + + JavascriptManager jsManager = pcontext.getJavascriptManager(); + if(isUpdate) { + pcontext.addUIComponentToUpdateByAjax(uiParent); + } else { + StringBuffer buffer = new StringBuffer(); + buffer.append("eXo.portal.UIPortal.removeComponent('"); + if (uiComponent instanceof UIPortlet) + { + buffer.append(UI_PORTLET_PREFIX); + } + buffer.append(uiComponent.getId()); + buffer.append("');"); + jsManager.addJavascript(buffer.toString()); + } + jsManager.addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); + } + + static public class MoveChildActionListener extends EventListener<UIContainer> + { + public void execute(Event<UIContainer> event) throws Exception + { + PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); + String insertPosition = pcontext.getRequestParameter("insertPosition"); + int position = -1; + try + { + position = Integer.parseInt(insertPosition); + } + catch (Exception exp) + { + position = -1; + } + + boolean newComponent = false; + String paramNewComponent = pcontext.getRequestParameter("isAddingNewly"); + + if (paramNewComponent != null) + newComponent = Boolean.valueOf(paramNewComponent).booleanValue(); + + UIPortalApplication uiApp = event.getSource().getAncestorOfType(UIPortalApplication.class); + UIPortalComposer portalComposer = uiApp.findFirstComponentOfType(UIPortalComposer.class); + + if (newComponent) + { + portalComposer.updateWorkspaceComponent(); + pcontext.ignoreAJAXUpdateOnPortlets(true); + } + + UIWorkingWorkspace uiWorkingWS = uiApp.getChild(UIWorkingWorkspace.class); + UIComponent uiWorking = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class); + if (!uiWorking.isRendered()) + { + UIEditInlineWorkspace uiEditWS = uiWorkingWS.getChild(UIEditInlineWorkspace.class); + uiWorking = uiEditWS.getUIComponent(); + } + + String sourceId = pcontext.getRequestParameter("srcID"); + UIComponent uiSource = uiWorking.findComponentById(sourceId); + + UIContainer uiTarget = uiWorking.findComponentById(pcontext.getRequestParameter("targetID")); + if (position < 0 && uiTarget.getChildren().size() > 0) + { + position = uiTarget.getChildren().size(); + } + else if (position < 0) + { + position = 0; + } + + if (uiSource == null) + { + UITabPane subTabPane = portalComposer.getChild(UITabPane.class); + UIContainerList uiContainerConfig = subTabPane.getChild(UIContainerList.class); + if (uiContainerConfig != null && subTabPane.getSelectedTabId().equals(uiContainerConfig.getId())) + { + org.exoplatform.portal.webui.container.UIContainer uiContainer = + uiTarget.createUIComponent(org.exoplatform.portal.webui.container.UIContainer.class, null, null); + Container container = uiContainerConfig.getContainer(sourceId); + container.setId(String.valueOf(container.hashCode())); + uiContainer.setStorageId(container.getStorageId()); + PortalDataMapper.toUIContainer(uiContainer, container); + String[] accessPers = uiContainer.getAccessPermissions(); + for (String accessPer : accessPers) + { + if (accessPer.equals("")) + accessPer = null; + } + if (accessPers == null || accessPers.length == 0) + accessPers = new String[]{UserACL.EVERYONE}; + uiContainer.setAccessPermissions(accessPers); + uiSource = uiContainer; + } + else + { + Application app = null; + UIApplicationList appList = uiApp.findFirstComponentOfType(UIApplicationList.class); + app = appList.getApplication(sourceId); + ApplicationType applicationType = app.getType(); + + // + UIPortlet uiPortlet = uiTarget.createUIComponent(UIPortlet.class, null, null); + if (app.getDisplayName() != null) + { + uiPortlet.setTitle(app.getDisplayName()); + } + else if (app.getApplicationName() != null) + { + uiPortlet.setTitle(app.getApplicationName()); + } + uiPortlet.setDescription(app.getDescription()); + List<String> accessPersList = app.getAccessPermissions(); + String[] accessPers = accessPersList.toArray(new String[accessPersList.size()]); + for (String accessPer : accessPers) + { + if (accessPer.equals("")) + accessPers = null; + } + if (accessPers == null || accessPers.length == 0) + accessPers = new String[]{UserACL.EVERYONE}; + uiPortlet.setAccessPermissions(accessPers); + UIPage uiPage = uiTarget.getAncestorOfType(UIPage.class); + + // Hardcode on state to fix error while drag/drop Dashboard + if ("dashboard/DashboardPortlet".equals(app.getContentId())) + { + TransientApplicationState state = new TransientApplicationState<Object>(app.getContentId()); + uiPortlet.setState(new PortletState(state, applicationType)); + } + else + { + ApplicationState state; + // if we have a new portlet added to the page we need for it to have its own state. + // otherwise all new portlets added to a page will have the same state. + if (newComponent) + { + state = new TransientApplicationState<Object>(app.getContentId()); + } + // if the portlet is not new, then we should clone it from the original portlet + else + { + state = new CloneApplicationState<Object>(app.getStorageId()); + } + uiPortlet.setState(new PortletState(state, applicationType)); + } + uiPortlet.setPortletInPortal(uiTarget instanceof UIPortal); + uiPortlet.setShowEditControl(true); + + //TODO Wait to fix issue EXOGTN-213 and then + //we should get "showInfobar" from current UI portal instead of Storage service + UIPortal currentPortal = Util.getUIPortal(); + DataStorage storage = uiApp.getApplicationComponent(DataStorage.class); + uiPortlet.setShowInfoBar(storage.getPortalConfig(currentPortal.getSiteKey().getTypeName(), currentPortal.getSiteKey().getName()).isShowInfobar()); + uiSource = uiPortlet; + } + List<UIComponent> children = uiTarget.getChildren(); + uiSource.setParent(uiTarget); + children.add(position, uiSource); + return; + } + + org.exoplatform.portal.webui.container.UIContainer uiParent = uiSource.getParent(); + if (uiParent == uiTarget) + { + int currentIdx = uiTarget.getChildren().indexOf(uiSource); + if (position <= currentIdx) + { + uiTarget.getChildren().add(position, uiSource); + currentIdx++; + uiTarget.getChildren().remove(currentIdx); + return; + } + uiTarget.getChildren().remove(currentIdx); + if (position >= uiTarget.getChildren().size()) + { + position = uiTarget.getChildren().size(); + } + uiTarget.getChildren().add(position, uiSource); + return; + } + + uiTarget.getChildren().add(position, uiSource); + uiSource.setParent(uiTarget); + + if (UITabContainer.TAB_CONTAINER.equals(uiParent.getFactoryId())) + { + if (uiParent.getChildren().size() == 1) + { + UIContainer uiTabParent = uiParent.getParent(); + if (uiTabParent.getChildren().size() > 1) + { + removeUIComponent(uiParent, pcontext, false); + } + else + { + removeUIComponent(uiTabParent, pcontext, false); + } + } + else + { + uiParent.getChildren().remove(uiSource); + pcontext.addUIComponentToUpdateByAjax(uiParent); + } + } + else if (org.exoplatform.portal.webui.container.UIContainer.TABLE_COLUMN_CONTAINER.equals(uiParent + .getFactoryId()) && uiParent.getChildren().size() == 1) + { + removeUIComponent(uiParent, pcontext, false); + } + else + { + uiParent.getChildren().remove(uiSource); + } + } + } + + public static class ChangeLanguageActionListener extends EventListener<UIPortal> + { + + @Override + public void execute(Event<UIPortal> event) throws Exception + { + UIPortal uiPortal = event.getSource(); + UIPortalApplication uiPortalApp = uiPortal.getAncestorOfType(UIPortalApplication.class); + UIMaskWorkspace uiMaskWorkspace = uiPortalApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); + uiMaskWorkspace.createUIComponent(UILanguageSelector.class, null, null); + event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace); + } + + } + + public static class RecoveryPasswordAndUsernameActionListener extends EventListener<UIPortal> + { + @Override + public void execute(Event<UIPortal> event) throws Exception + { + UIPortal uiPortal = event.getSource(); + RemindPasswordTokenService tokenService = uiPortal.getApplicationComponent(RemindPasswordTokenService.class); + String tokenId = event.getRequestContext().getRequestParameter("tokenId"); + + WebuiRequestContext requestContext = event.getRequestContext(); + GateInToken token = tokenService.getToken(tokenId); + if (token == null) + { + requestContext.getUIApplication() + .addMessage(new ApplicationMessage("UIForgetPassword.msg.expration", null)); + requestContext.addUIComponentToUpdateByAjax(uiPortal.getParent()); + return; + } + + OrganizationService orgSrc = uiPortal.getApplicationComponent(OrganizationService.class); + // get user + User user = orgSrc.getUserHandler().findUserByName(token.getPayload().getUsername()); + if (user == null) + { + requestContext.getUIApplication() + .addMessage(new ApplicationMessage("UIForgetPassword.msg.user-delete", null)); + return; + } + + UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); + UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); + + UIResetPassword uiReset = uiMaskWS.createUIComponent(UIResetPassword.class, null, null); + uiReset.setUser(user); + uiReset.setTokenId(tokenId); + uiMaskWS.setUIComponent(uiReset); + uiMaskWS.setWindowSize(630, -1); + event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); + } + } + + static public class ChangeSkinActionListener extends EventListener<UIPortal> + { + public void execute(Event<UIPortal> event) throws Exception + { + UIPortal uiPortal = event.getSource(); + UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); + UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); + + UISkinSelector uiChangeSkin = uiMaskWS.createUIComponent(UISkinSelector.class, null, null); + uiMaskWS.setUIComponent(uiChangeSkin); + uiMaskWS.setWindowSize(640, 400); + uiMaskWS.setShow(true); + event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS); + } + } + + static public class ChangeApplicationListActionListener extends EventListener<UIPortal> + { + public void execute(Event<UIPortal> event) throws Exception + { + UIPortal uiPortal = event.getSource(); + UIPortalApplication application = uiPortal.getAncestorOfType(UIPortalApplication.class); + UIPortalComposer composer = application.findFirstComponentOfType(UIPortalComposer.class); + UITabPane uiTabPane = composer.getChild(UITabPane.class); + String appListId = uiTabPane.getChild(UIApplicationList.class).getId(); + uiTabPane.replaceChild(appListId, composer.createUIComponent(UIApplicationList.class, null, null)); + } + } + + public static class EditPortalPropertiesActionListener extends EventListener<UIPortal> + { + public void execute(Event<UIPortal> event) throws Exception + { + String portalName = event.getRequestContext().getRequestParameter("portalName"); + UIPortal uiPortal = Util.getUIPortal(); + UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class); + UserPortalConfigService service = uiApp.getApplicationComponent(UserPortalConfigService.class); + PortalRequestContext context = Util.getPortalRequestContext(); + if (portalName != null + && service.getUserPortalConfig(portalName, event.getRequestContext().getRemoteUser()) == null) + { + uiApp.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist", new String[]{portalName})); + context.addUIComponentToUpdateByAjax(uiApp.findFirstComponentOfType(UIWorkingWorkspace.class)); + context.setFullRender(true); + return; + } + + UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); + UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm"); + portalForm.setPortalOwner(portalName); + portalForm.setBindingBean(); + uiMaskWS.setWindowSize(700, -1); + context.addUIComponentToUpdateByAjax(uiMaskWS); + } + } +} Deleted: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2012-07-03 12:10:17 UTC (rev 8765) @@ -1,430 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.webui.util; - -import org.exoplatform.portal.config.UserPortalConfig; -import org.exoplatform.portal.config.model.Application; -import org.exoplatform.portal.config.model.ApplicationType; -import org.exoplatform.portal.config.model.Container; -import org.exoplatform.portal.config.model.Dashboard; -import org.exoplatform.portal.config.model.ModelObject; -import org.exoplatform.portal.config.model.Page; -import org.exoplatform.portal.config.model.PageBody; -import org.exoplatform.portal.config.model.PortalConfig; -import org.exoplatform.portal.config.model.SiteBody; -import org.exoplatform.portal.mop.SiteKey; -import org.exoplatform.portal.pom.spi.gadget.Gadget; -import org.exoplatform.portal.webui.application.PortletState; -import org.exoplatform.portal.webui.application.UIGadget; -import org.exoplatform.portal.webui.application.UIPortlet; -import org.exoplatform.portal.webui.container.UIColumnContainer; -import org.exoplatform.portal.webui.container.UIContainer; -import org.exoplatform.portal.webui.container.UITabContainer; -import org.exoplatform.portal.webui.page.UIPage; -import org.exoplatform.portal.webui.page.UIPageBody; -import org.exoplatform.portal.webui.page.UISiteBody; -import org.exoplatform.portal.webui.portal.UIPortal; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.webui.core.UIComponent; -import org.gatein.common.net.media.MediaType; -import org.gatein.pc.api.Portlet; -import org.gatein.pc.api.info.ModeInfo; -import org.gatein.pc.api.info.PortletInfo; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -/** - * Created by The eXo Platform SAS May 4, 2007 TODO: Rename this to - * PortalDataModelMapper - */ -public class PortalDataMapper -{ - - protected static final Log log = ExoLogger.getLogger("portal:PortalDataMapper"); - - @SuppressWarnings("unchecked") - public static ModelObject buildModelObject(UIComponent uiComponent) - { - ModelObject model = null; - if (uiComponent instanceof UIPortal) - { - model = toPortal((UIPortal)uiComponent); - } - else if (uiComponent instanceof UIPageBody) - { - model = new PageBody(((UIPageBody)uiComponent).getStorageId()); - } - else if (uiComponent instanceof UIPage) - { - model = toPageModel((UIPage)uiComponent); - } - else if (uiComponent instanceof UIPortlet) - { - model = toPortletModel((UIPortlet)uiComponent); - } - else if (uiComponent instanceof UIContainer) - { - model = toContainer((UIContainer)uiComponent); - } - else if (uiComponent instanceof UIGadget) - { - model = toGadget((UIGadget)uiComponent); - } - return model; - } - - private static Application<Gadget> toGadget(UIGadget uiGadget) - { - Application<Gadget> app = Application.createGadgetApplication(uiGadget.getStorageId()); - app.setState(uiGadget.getState()); - app.setProperties(uiGadget.getProperties()); - app.setStorageName(uiGadget.getStorageName()); - return app; - } - - public static void toContainer(Container model, UIContainer uiContainer) - { - model.setId(uiContainer.getId()); - model.setName(uiContainer.getName()); - model.setTitle(uiContainer.getTitle()); - model.setIcon(uiContainer.getIcon()); - model.setDescription(uiContainer.getDescription()); - model.setHeight(uiContainer.getHeight()); - model.setWidth(uiContainer.getWidth()); - model.setTemplate(uiContainer.getTemplate()); - model.setFactoryId(uiContainer.getFactoryId()); - model.setAccessPermissions(uiContainer.getAccessPermissions()); - - List<UIComponent> uiChildren = uiContainer.getChildren(); - if (uiChildren == null) - return; - ArrayList<ModelObject> children = new ArrayList<ModelObject>(); - for (UIComponent child : uiChildren) - { - ModelObject component = buildModelObject(child); - if (component != null) - children.add(component); - } - model.setChildren(children); - } - - private static <S> Application<S> toPortletModel(UIPortlet<S, ?> uiPortlet) - { - Application<S> model; - PortletState<S> state = uiPortlet.getState(); - ApplicationType<S> type = state.getApplicationType(); - if (type == ApplicationType.PORTLET) - { - model = (Application<S>)Application.createPortletApplication(uiPortlet.getStorageId()); - } - else if (type == ApplicationType.GADGET) - { - model = (Application<S>)Application.createGadgetApplication(uiPortlet.getStorageId()); - } - else if (type == ApplicationType.WSRP_PORTLET) - { - model = (Application<S>)Application.createWSRPApplication(uiPortlet.getStorageId()); - } - else - { - throw new AssertionError(); - } - - // - model.setStorageName(uiPortlet.getStorageName()); - model.setState(state.getApplicationState()); - model.setTitle(uiPortlet.getTitle()); - model.setWidth(uiPortlet.getWidth()); - model.setHeight(uiPortlet.getHeight()); - model.setDescription(uiPortlet.getDescription()); - model.setShowInfoBar(uiPortlet.getShowInfoBar()); - model.setShowApplicationState(uiPortlet.getShowWindowState()); - model.setShowApplicationMode(uiPortlet.getShowPortletMode()); - model.setDescription(uiPortlet.getDescription()); - model.setIcon(uiPortlet.getIcon()); - model.setProperties(uiPortlet.getProperties()); - model.setTheme(uiPortlet.getTheme()); - model.setAccessPermissions(uiPortlet.getAccessPermissions()); - model.setModifiable(uiPortlet.isModifiable()); - return model; - } - - private static Container toContainer(UIContainer uiContainer) - { - Container model = new Container(uiContainer.getStorageId()); - toContainer(model, uiContainer); - return model; - } - - static public Page toPageModel(UIPage uiPage) - { - Page model = new Page(uiPage.getStorageId()); - toContainer(model, uiPage); - model.setOwnerId(uiPage.getSiteKey().getName()); - model.setOwnerType(uiPage.getSiteKey().getTypeName()); - model.setIcon(uiPage.getIcon()); - model.setPageId(uiPage.getPageId()); - model.setTitle(uiPage.getTitle()); - model.setAccessPermissions(uiPage.getAccessPermissions()); - model.setEditPermission(uiPage.getEditPermission()); - model.setFactoryId(uiPage.getFactoryId()); - model.setShowMaxWindow(uiPage.isShowMaxWindow()); - model.setModifiable(uiPage.isModifiable()); - return model; - } - - static private PortalConfig toPortal(UIPortal uiPortal) - { - PortalConfig model = new PortalConfig(uiPortal.getSiteType().getName(), uiPortal.getName(), uiPortal.getStorageId()); - model.setAccessPermissions(uiPortal.getAccessPermissions()); - model.setEditPermission(uiPortal.getEditPermission()); - model.setLabel(uiPortal.getLabel()); - model.setDescription(uiPortal.getDescription()); - model.setLocale(uiPortal.getLocale()); - model.setSkin(uiPortal.getSkin()); - model.setModifiable(uiPortal.isModifiable()); - model.setProperties(uiPortal.getProperties()); - - model.setPortalLayout(new Container()); - - List<UIComponent> children = uiPortal.getChildren(); - if (children == null) - return model; - ArrayList<ModelObject> newChildren = new ArrayList<ModelObject>(); - for (UIComponent child : children) - { - ModelObject component = buildModelObject(child); - if (component != null) - newChildren.add(component); - } - model.getPortalLayout().setChildren(newChildren); - return model; - } - - static public void toUIGadget(UIGadget uiGadget, Application<Gadget> model) throws Exception - { - uiGadget.setProperties(model.getProperties()); - uiGadget.setState(model.getState()); - } - - /** - * Fill the UI component with both information from the persistent model and - * some coming from the portlet.xml defined by the JSR 286 specification - */ - private static <S> void toUIPortlet(UIPortlet<S, ?> uiPortlet, Application<S> model) throws Exception - { - - // - PortletState<S> portletState = new PortletState<S>(model.getState(), model.getType()); - - /* - * Fill UI component object with info from the XML file that persist portlet - * information - */ - uiPortlet.setWidth(model.getWidth()); - uiPortlet.setHeight(model.getHeight()); - uiPortlet.setState(portletState); - uiPortlet.setTitle(model.getTitle()); - uiPortlet.setIcon(model.getIcon()); - uiPortlet.setDescription(model.getDescription()); - uiPortlet.setShowInfoBar(model.getShowInfoBar()); - uiPortlet.setShowWindowState(model.getShowApplicationState()); - uiPortlet.setShowPortletMode(model.getShowApplicationMode()); - uiPortlet.setProperties(model.getProperties()); - uiPortlet.setTheme(model.getTheme()); - if (model.getAccessPermissions() != null) - uiPortlet.setAccessPermissions(model.getAccessPermissions()); - uiPortlet.setModifiable(model.isModifiable()); - - Portlet portlet = uiPortlet.getProducedOfferedPortlet(); - if (portlet == null || portlet.getInfo() == null) - return; - - PortletInfo portletInfo = portlet.getInfo(); - - /* - * Define which portlet modes the portlet supports and hence should be shown - * in the portlet info bar - */ - Set<ModeInfo> modes = portletInfo.getCapabilities().getModes(MediaType.create("text/html")); - List<String> supportModes = new ArrayList<String>(); - for (ModeInfo modeInfo : modes) - { - String modeName = modeInfo.getModeName().toLowerCase(); - if ("config".equals(modeInfo.getModeName())) - { - supportModes.add(modeName); - } - else - { - supportModes.add(modeName); - } - } - - if (supportModes.size() > 1) - supportModes.remove("view"); - uiPortlet.setSupportModes(supportModes); - } - - public static void toUIContainer(UIContainer uiContainer, Container model) throws Exception - { - toUIContainer(uiContainer, model, model instanceof Dashboard); - } - - private static void toUIContainer(UIContainer uiContainer, Container model, boolean dashboard) throws Exception - { - uiContainer.setStorageId(model.getStorageId()); - uiContainer.setId(model.getId()); - uiContainer.setWidth(model.getWidth()); - uiContainer.setHeight(model.getHeight()); - uiContainer.setTitle(model.getTitle()); - uiContainer.setIcon(model.getIcon()); - uiContainer.setDescription(model.getDescription()); - uiContainer.setFactoryId(model.getFactoryId()); - uiContainer.setName(model.getName()); - uiContainer.setTemplate(model.getTemplate()); - if (model.getAccessPermissions() != null) - uiContainer.setAccessPermissions(model.getAccessPermissions()); - - List<ModelObject> children = model.getChildren(); - if (children == null) - return; - for (Object child : children) - { - buildUIContainer(uiContainer, child, dashboard); - } - } - - static public void toUIPage(UIPage uiPage, Page model) throws Exception - { - toUIContainer(uiPage, model); - uiPage.setSiteKey(new SiteKey(model.getOwnerType(), model.getOwnerId())); - uiPage.setIcon(model.getIcon()); - uiPage.setAccessPermissions(model.getAccessPermissions()); - uiPage.setEditPermission(model.getEditPermission()); - uiPage.setFactoryId(model.getFactoryId()); - uiPage.setPageId(model.getPageId()); - uiPage.setTitle(model.getTitle()); - uiPage.setShowMaxWindow(model.isShowMaxWindow()); - uiPage.setModifiable(model.isModifiable()); - - List<UIPortlet> portlets = new ArrayList<UIPortlet>(); - uiPage.findComponentOfType(portlets, UIPortlet.class); - for (UIPortlet portlet : portlets) - { - portlet.setPortletInPortal(false); - } - } - - static public void toUIPortal(UIPortal uiPortal, PortalConfig model) throws Exception - { - uiPortal.setSiteKey(new SiteKey(model.getType(), model.getName())); - uiPortal.setStorageId(model.getStorageId()); - uiPortal.setName(model.getName()); - uiPortal.setId("UIPortal"); - // uiPortal.setFactoryId(model.getFactoryId()); - uiPortal.setModifiable(model.isModifiable()); - - uiPortal.setLabel(model.getLabel()); - uiPortal.setDescription(model.getDescription()); - uiPortal.setLocale(model.getLocale()); - uiPortal.setSkin(model.getSkin()); - uiPortal.setAccessPermissions(model.getAccessPermissions()); - uiPortal.setEditPermission(model.getEditPermission()); - uiPortal.setProperties(model.getProperties()); - - List<ModelObject> children = model.getPortalLayout().getChildren(); - if (children != null) - { - for (Object child : children) - { - buildUIContainer(uiPortal, child, false); - } - } - } - - private static void buildUIContainer(UIContainer uiContainer, Object model, boolean dashboard) throws Exception - { - UIComponent uiComponent = null; - WebuiRequestContext context = Util.getPortalRequestContext(); - - if (model instanceof SiteBody) - { - UISiteBody uiSiteBody = uiContainer.createUIComponent(context, UISiteBody.class, null, null); - uiSiteBody.setStorageId(((SiteBody)model).getStorageId()); - uiComponent = uiSiteBody; - } - else if (model instanceof PageBody) - { - UIPageBody uiPageBody = uiContainer.createUIComponent(context, UIPageBody.class, null, null); - uiPageBody.setStorageId(((PageBody)model).getStorageId()); - uiComponent = uiPageBody; - } - else if (model instanceof Application) - { - Application application = (Application)model; - - if (dashboard && application.getType() == ApplicationType.GADGET) - { - Application<Gadget> ga = (Application<Gadget>)application; - UIGadget uiGadget = uiContainer.createUIComponent(context, UIGadget.class, null, null); - uiGadget.setStorageId(application.getStorageId()); - toUIGadget(uiGadget, ga); - uiComponent = uiGadget; - } - else - { - UIPortlet uiPortlet = uiContainer.createUIComponent(context, UIPortlet.class, null, null); - uiPortlet.setStorageId(application.getStorageId()); - if(application.getStorageName()!=null) { - uiPortlet.setStorageName(application.getStorageName()); - } - toUIPortlet(uiPortlet, application); - uiComponent = uiPortlet; - } - } - else if (model instanceof Container) - { - Container container = (Container)model; - UIContainer uiTempContainer ; - if(UITabContainer.TAB_CONTAINER.equals(container.getFactoryId())) - { - uiTempContainer = uiContainer.createUIComponent(context, UITabContainer.class, null, null); - } - else if (UIColumnContainer.COLUMN_CONTAINER.equals(container.getFactoryId())) - { - uiTempContainer = uiContainer.createUIComponent(context, UIColumnContainer.class, null, null); - } - else - { - uiTempContainer = uiContainer.createUIComponent(context, UIContainer.class, null, null); - } - - toUIContainer(uiTempContainer, (Container)model, dashboard); - uiComponent = uiTempContainer; - } - uiContainer.addChild(uiComponent); - } - -} Copied: epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java (from rev 8764, epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java) =================================================================== --- epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java (rev 0) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2012-07-03 12:10:17 UTC (rev 8765) @@ -0,0 +1,425 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.webui.util; + +import org.exoplatform.portal.config.UserPortalConfig; +import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.ApplicationType; +import org.exoplatform.portal.config.model.Container; +import org.exoplatform.portal.config.model.Dashboard; +import org.exoplatform.portal.config.model.ModelObject; +import org.exoplatform.portal.config.model.Page; +import org.exoplatform.portal.config.model.PageBody; +import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.config.model.SiteBody; +import org.exoplatform.portal.mop.SiteKey; +import org.exoplatform.portal.pom.spi.gadget.Gadget; +import org.exoplatform.portal.webui.application.PortletState; +import org.exoplatform.portal.webui.application.UIGadget; +import org.exoplatform.portal.webui.application.UIPortlet; +import org.exoplatform.portal.webui.container.UIContainer; +import org.exoplatform.portal.webui.container.UITabContainer; +import org.exoplatform.portal.webui.page.UIPage; +import org.exoplatform.portal.webui.page.UIPageBody; +import org.exoplatform.portal.webui.page.UISiteBody; +import org.exoplatform.portal.webui.portal.UIPortal; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.exoplatform.webui.application.WebuiRequestContext; +import org.exoplatform.webui.core.UIComponent; +import org.gatein.common.net.media.MediaType; +import org.gatein.pc.api.Portlet; +import org.gatein.pc.api.info.ModeInfo; +import org.gatein.pc.api.info.PortletInfo; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +/** + * Created by The eXo Platform SAS May 4, 2007 TODO: Rename this to + * PortalDataModelMapper + */ +public class PortalDataMapper +{ + + protected static final Log log = ExoLogger.getLogger("portal:PortalDataMapper"); + + @SuppressWarnings("unchecked") + public static ModelObject buildModelObject(UIComponent uiComponent) + { + ModelObject model = null; + if (uiComponent instanceof UIPortal) + { + model = toPortal((UIPortal)uiComponent); + } + else if (uiComponent instanceof UIPageBody) + { + model = new PageBody(((UIPageBody)uiComponent).getStorageId()); + } + else if (uiComponent instanceof UIPage) + { + model = toPageModel((UIPage)uiComponent); + } + else if (uiComponent instanceof UIPortlet) + { + model = toPortletModel((UIPortlet)uiComponent); + } + else if (uiComponent instanceof UIContainer) + { + model = toContainer((UIContainer)uiComponent); + } + else if (uiComponent instanceof UIGadget) + { + model = toGadget((UIGadget)uiComponent); + } + return model; + } + + private static Application<Gadget> toGadget(UIGadget uiGadget) + { + Application<Gadget> app = Application.createGadgetApplication(uiGadget.getStorageId()); + app.setState(uiGadget.getState()); + app.setProperties(uiGadget.getProperties()); + app.setStorageName(uiGadget.getStorageName()); + return app; + } + + public static void toContainer(Container model, UIContainer uiContainer) + { + model.setId(uiContainer.getId()); + model.setName(uiContainer.getName()); + model.setTitle(uiContainer.getTitle()); + model.setIcon(uiContainer.getIcon()); + model.setDescription(uiContainer.getDescription()); + model.setHeight(uiContainer.getHeight()); + model.setWidth(uiContainer.getWidth()); + model.setTemplate(uiContainer.getTemplate()); + model.setFactoryId(uiContainer.getFactoryId()); + model.setAccessPermissions(uiContainer.getAccessPermissions()); + + List<UIComponent> uiChildren = uiContainer.getChildren(); + if (uiChildren == null) + return; + ArrayList<ModelObject> children = new ArrayList<ModelObject>(); + for (UIComponent child : uiChildren) + { + ModelObject component = buildModelObject(child); + if (component != null) + children.add(component); + } + model.setChildren(children); + } + + private static <S> Application<S> toPortletModel(UIPortlet<S, ?> uiPortlet) + { + Application<S> model; + PortletState<S> state = uiPortlet.getState(); + ApplicationType<S> type = state.getApplicationType(); + if (type == ApplicationType.PORTLET) + { + model = (Application<S>)Application.createPortletApplication(uiPortlet.getStorageId()); + } + else if (type == ApplicationType.GADGET) + { + model = (Application<S>)Application.createGadgetApplication(uiPortlet.getStorageId()); + } + else if (type == ApplicationType.WSRP_PORTLET) + { + model = (Application<S>)Application.createWSRPApplication(uiPortlet.getStorageId()); + } + else + { + throw new AssertionError(); + } + + // + model.setStorageName(uiPortlet.getStorageName()); + model.setState(state.getApplicationState()); + model.setTitle(uiPortlet.getTitle()); + model.setWidth(uiPortlet.getWidth()); + model.setHeight(uiPortlet.getHeight()); + model.setDescription(uiPortlet.getDescription()); + model.setShowInfoBar(uiPortlet.getShowInfoBar()); + model.setShowApplicationState(uiPortlet.getShowWindowState()); + model.setShowApplicationMode(uiPortlet.getShowPortletMode()); + model.setDescription(uiPortlet.getDescription()); + model.setIcon(uiPortlet.getIcon()); + model.setProperties(uiPortlet.getProperties()); + model.setTheme(uiPortlet.getTheme()); + model.setAccessPermissions(uiPortlet.getAccessPermissions()); + model.setModifiable(uiPortlet.isModifiable()); + return model; + } + + private static Container toContainer(UIContainer uiContainer) + { + Container model = new Container(uiContainer.getStorageId()); + toContainer(model, uiContainer); + return model; + } + + static public Page toPageModel(UIPage uiPage) + { + Page model = new Page(uiPage.getStorageId()); + toContainer(model, uiPage); + model.setOwnerId(uiPage.getSiteKey().getName()); + model.setOwnerType(uiPage.getSiteKey().getTypeName()); + model.setIcon(uiPage.getIcon()); + model.setPageId(uiPage.getPageId()); + model.setTitle(uiPage.getTitle()); + model.setAccessPermissions(uiPage.getAccessPermissions()); + model.setEditPermission(uiPage.getEditPermission()); + model.setFactoryId(uiPage.getFactoryId()); + model.setShowMaxWindow(uiPage.isShowMaxWindow()); + model.setModifiable(uiPage.isModifiable()); + return model; + } + + static private PortalConfig toPortal(UIPortal uiPortal) + { + PortalConfig model = new PortalConfig(uiPortal.getSiteType().getName(), uiPortal.getName(), uiPortal.getStorageId()); + model.setAccessPermissions(uiPortal.getAccessPermissions()); + model.setEditPermission(uiPortal.getEditPermission()); + model.setLabel(uiPortal.getLabel()); + model.setDescription(uiPortal.getDescription()); + model.setLocale(uiPortal.getLocale()); + model.setSkin(uiPortal.getSkin()); + model.setModifiable(uiPortal.isModifiable()); + model.setProperties(uiPortal.getProperties()); + + model.setPortalLayout(new Container()); + + List<UIComponent> children = uiPortal.getChildren(); + if (children == null) + return model; + ArrayList<ModelObject> newChildren = new ArrayList<ModelObject>(); + for (UIComponent child : children) + { + ModelObject component = buildModelObject(child); + if (component != null) + newChildren.add(component); + } + model.getPortalLayout().setChildren(newChildren); + return model; + } + + static public void toUIGadget(UIGadget uiGadget, Application<Gadget> model) throws Exception + { + uiGadget.setProperties(model.getProperties()); + uiGadget.setState(model.getState()); + } + + /** + * Fill the UI component with both information from the persistent model and + * some coming from the portlet.xml defined by the JSR 286 specification + */ + private static <S> void toUIPortlet(UIPortlet<S, ?> uiPortlet, Application<S> model) throws Exception + { + + // + PortletState<S> portletState = new PortletState<S>(model.getState(), model.getType()); + + /* + * Fill UI component object with info from the XML file that persist portlet + * information + */ + uiPortlet.setWidth(model.getWidth()); + uiPortlet.setHeight(model.getHeight()); + uiPortlet.setState(portletState); + uiPortlet.setTitle(model.getTitle()); + uiPortlet.setIcon(model.getIcon()); + uiPortlet.setDescription(model.getDescription()); + uiPortlet.setShowInfoBar(model.getShowInfoBar()); + uiPortlet.setShowWindowState(model.getShowApplicationState()); + uiPortlet.setShowPortletMode(model.getShowApplicationMode()); + uiPortlet.setProperties(model.getProperties()); + uiPortlet.setTheme(model.getTheme()); + if (model.getAccessPermissions() != null) + uiPortlet.setAccessPermissions(model.getAccessPermissions()); + uiPortlet.setModifiable(model.isModifiable()); + + Portlet portlet = uiPortlet.getProducedOfferedPortlet(); + if (portlet == null || portlet.getInfo() == null) + return; + + PortletInfo portletInfo = portlet.getInfo(); + + /* + * Define which portlet modes the portlet supports and hence should be shown + * in the portlet info bar + */ + Set<ModeInfo> modes = portletInfo.getCapabilities().getModes(MediaType.create("text/html")); + List<String> supportModes = new ArrayList<String>(); + for (ModeInfo modeInfo : modes) + { + String modeName = modeInfo.getModeName().toLowerCase(); + if ("config".equals(modeInfo.getModeName())) + { + supportModes.add(modeName); + } + else + { + supportModes.add(modeName); + } + } + + if (supportModes.size() > 1) + supportModes.remove("view"); + uiPortlet.setSupportModes(supportModes); + } + + public static void toUIContainer(UIContainer uiContainer, Container model) throws Exception + { + toUIContainer(uiContainer, model, model instanceof Dashboard); + } + + private static void toUIContainer(UIContainer uiContainer, Container model, boolean dashboard) throws Exception + { + uiContainer.setStorageId(model.getStorageId()); + uiContainer.setId(model.getId()); + uiContainer.setWidth(model.getWidth()); + uiContainer.setHeight(model.getHeight()); + uiContainer.setTitle(model.getTitle()); + uiContainer.setIcon(model.getIcon()); + uiContainer.setDescription(model.getDescription()); + uiContainer.setFactoryId(model.getFactoryId()); + uiContainer.setName(model.getName()); + uiContainer.setTemplate(model.getTemplate()); + if (model.getAccessPermissions() != null) + uiContainer.setAccessPermissions(model.getAccessPermissions()); + + List<ModelObject> children = model.getChildren(); + if (children == null) + return; + for (Object child : children) + { + buildUIContainer(uiContainer, child, dashboard); + } + } + + static public void toUIPage(UIPage uiPage, Page model) throws Exception + { + toUIContainer(uiPage, model); + uiPage.setSiteKey(new SiteKey(model.getOwnerType(), model.getOwnerId())); + uiPage.setIcon(model.getIcon()); + uiPage.setAccessPermissions(model.getAccessPermissions()); + uiPage.setEditPermission(model.getEditPermission()); + uiPage.setFactoryId(model.getFactoryId()); + uiPage.setPageId(model.getPageId()); + uiPage.setTitle(model.getTitle()); + uiPage.setShowMaxWindow(model.isShowMaxWindow()); + uiPage.setModifiable(model.isModifiable()); + + List<UIPortlet> portlets = new ArrayList<UIPortlet>(); + uiPage.findComponentOfType(portlets, UIPortlet.class); + for (UIPortlet portlet : portlets) + { + portlet.setPortletInPortal(false); + } + } + + static public void toUIPortal(UIPortal uiPortal, PortalConfig model) throws Exception + { + uiPortal.setSiteKey(new SiteKey(model.getType(), model.getName())); + uiPortal.setStorageId(model.getStorageId()); + uiPortal.setName(model.getName()); + uiPortal.setId("UIPortal"); + // uiPortal.setFactoryId(model.getFactoryId()); + uiPortal.setModifiable(model.isModifiable()); + + uiPortal.setLabel(model.getLabel()); + uiPortal.setDescription(model.getDescription()); + uiPortal.setLocale(model.getLocale()); + uiPortal.setSkin(model.getSkin()); + uiPortal.setAccessPermissions(model.getAccessPermissions()); + uiPortal.setEditPermission(model.getEditPermission()); + uiPortal.setProperties(model.getProperties()); + + List<ModelObject> children = model.getPortalLayout().getChildren(); + if (children != null) + { + for (Object child : children) + { + buildUIContainer(uiPortal, child, false); + } + } + } + + private static void buildUIContainer(UIContainer uiContainer, Object model, boolean dashboard) throws Exception + { + UIComponent uiComponent = null; + WebuiRequestContext context = Util.getPortalRequestContext(); + + if (model instanceof SiteBody) + { + UISiteBody uiSiteBody = uiContainer.createUIComponent(context, UISiteBody.class, null, null); + uiSiteBody.setStorageId(((SiteBody)model).getStorageId()); + uiComponent = uiSiteBody; + } + else if (model instanceof PageBody) + { + UIPageBody uiPageBody = uiContainer.createUIComponent(context, UIPageBody.class, null, null); + uiPageBody.setStorageId(((PageBody)model).getStorageId()); + uiComponent = uiPageBody; + } + else if (model instanceof Application) + { + Application application = (Application)model; + + if (dashboard && application.getType() == ApplicationType.GADGET) + { + Application<Gadget> ga = (Application<Gadget>)application; + UIGadget uiGadget = uiContainer.createUIComponent(context, UIGadget.class, null, null); + uiGadget.setStorageId(application.getStorageId()); + toUIGadget(uiGadget, ga); + uiComponent = uiGadget; + } + else + { + UIPortlet uiPortlet = uiContainer.createUIComponent(context, UIPortlet.class, null, null); + uiPortlet.setStorageId(application.getStorageId()); + if(application.getStorageName()!=null) { + uiPortlet.setStorageName(application.getStorageName()); + } + toUIPortlet(uiPortlet, application); + uiComponent = uiPortlet; + } + } + else if (model instanceof Container) + { + Container container = (Container)model; + UIContainer uiTempContainer ; + if(UITabContainer.TAB_CONTAINER.equals(container.getFactoryId())) + { + uiTempContainer = uiContainer.createUIComponent(context, UITabContainer.class, null, null); + } + else + { + uiTempContainer = uiContainer.createUIComponent(context, UIContainer.class, null, null); + } + + toUIContainer(uiTempContainer, (Container)model, dashboard); + uiComponent = uiTempContainer; + } + uiContainer.addChild(uiComponent); + } + +} Modified: epp/portal/tags/EPP_5_2_2_ER01/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/webui/portlet/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-component/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-config/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -26,7 +26,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>extension-config</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-ear/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -28,7 +28,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>extension-ear</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-ear-as5/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -27,7 +27,7 @@ <parent> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>extension-ear-as5</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/extension-war/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -27,7 +27,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <artifactId>extension-war</artifactId> Modified: epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2012-07-02 18:04:46 UTC (rev 8759) +++ epp/portal/tags/EPP_5_2_2_ER01/wsrp-integration/pom.xml 2012-07-03 12:10:17 UTC (rev 8765) @@ -34,7 +34,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.2.ER01-SNAPSHOT</version> + <version>5.2.2.ER01</version> </parent> <description>GateIn WSRP Integration extension parent</description>