gatein SVN: r6881 - in epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources: conf and 1 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-07-18 10:10:08 -0400 (Mon, 18 Jul 2011)
New Revision: 6881
Added:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/portlet.xml
Log:
JBEPP-937: EPP52-EID_105: Global portlet.xml
Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/portlet.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/portlet.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/conf/gatein/portlet.xml 2011-07-18 14:10:08 UTC (rev 6881)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+
+ <!-- This filter collects runtime request statistics -->
+ <filter>
+ <filter-name>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-name>
+ <filter-class>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ <lifecycle>EVENT_PHASE</lifecycle>
+ <lifecycle>RESOURCE_PHASE</lifecycle>
+ </filter>
+
+</portlet-app>
13 years, 6 months
- 1
- 0
gatein SVN: r6880 - in epp/portal/branches/EPP_5_2_Branch: component and 35 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-07-18 10:06:00 -0400 (Mon, 18 Jul 2011)
New Revision: 6880
Added:
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java
epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java
Removed:
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jetty.properties
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java
Modified:
epp/portal/branches/EPP_5_2_Branch/
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties
epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml
epp/portal/branches/EPP_5_2_Branch/settings-all.xml
Log:
JBEPP-937: EPP52-EID_105: Global portlet.xml
Property changes on: epp/portal/branches/EPP_5_2_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1822:5943
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400
/portal/branches/site-describability:6171-6235
/portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1822:5943
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206,6437,6440,6452,6573
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1822/component:5943
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400
/portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1822/component:5943
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400
/portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6437,6440,6452,6573
Modified: epp/portal/branches/EPP_5_2_Branch/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 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-07-18 14:06:00 UTC (rev 6880)
@@ -17,7 +17,8 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-# Data
+#
+gatein.conf.dir=${jboss.server.home.dir}/conf/gatein
gatein.data.dir=${jboss.server.data.dir}/gatein
# DB
@@ -50,3 +51,5 @@
gatein.email.smtp.socketFactory.port=465
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+# Global portlet.xml
+gatein.portlet.config=${gatein.conf.dir}/portlet.xml
Deleted: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jetty.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jetty.properties 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jetty.properties 2011-07-18 14:06:00 UTC (rev 6880)
@@ -1,62 +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.
-#
-
-# Data
-gatein.data.dir=../gatein/data
-
-# DB
-gatein.db.data.dir=${gatein.data.dir}/db
-
-# JCR
-gatein.jcr.config.type=local
-gatein.jcr.datasource.name=gatein-jcr
-gatein.jcr.datasource.dialect=auto
-gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver
-gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/gatein-jcr_${name}
-gatein.jcr.datasource.username=sa
-gatein.jcr.datasource.password=
-
-gatein.jcr.data.dir=${gatein.data.dir}/jcr
-gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
-gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
-gatein.jcr.lock.cache.config=classpath:/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=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml
-gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml
-
-# IDM
-gatein.idm.datasource.name=jdbcidm
-gatein.idm.datasource.driver=org.hsqldb.jdbcDriver
-gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name}
-gatein.idm.datasource.username=sa
-gatein.idm.datasource.password=
-
-# Arjuna configuration
-com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta
-
-# 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
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -38,6 +38,10 @@
<artifactId>exo.portal.component.resources</artifactId>
</dependency>
<dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
</dependency>
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-07-18 14:06:00 UTC (rev 6880)
@@ -19,20 +19,31 @@
package org.exoplatform.portal.pc;
+import org.exoplatform.commons.utils.PropertyManager;
+import org.exoplatform.commons.utils.Safe;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.mc.PortletApplicationDeployer;
import org.gatein.pc.portlet.impl.metadata.PortletApplication10MetaData;
import org.gatein.wci.WebApp;
+import org.jboss.xb.binding.JBossXBException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
/**
- * Extends the {@link org.gatein.pc.mc.PortletApplicationDeployer} to configure the resource bundle factory
- * of deployed portlet applications. The resource bundle factory used is
- * {@link org.exoplatform.portal.pc.ExoResourceBundleFactory}.
+ * Extends the {@link org.gatein.pc.mc.PortletApplicationDeployer} to inject configuration metadata
+ * from global portlet.xml and to configure the resource bundle factory of deployed portlet
+ * applications. The resource bundle factory used is {@link org.exoplatform.portal.pc.ExoResourceBundleFactory}.
*
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
public class ExoPortletApplicationDeployer extends PortletApplicationDeployer
{
+ private final Logger log = LoggerFactory.getLogger(ExoPortletApplicationDeployer.class);
@Override
protected PortletApplication10MetaData buildPortletApplicationMetaData(WebApp webApp)
@@ -41,7 +52,58 @@
if (md != null)
{
md.setResourceBundleFactoryName(ExoResourceBundleFactory.class.getName());
+
+ String globalPortletLocation = PropertyManager.getProperty("gatein.portlet.config");
+ if (globalPortletLocation != null)
+ {
+ try
+ {
+ GlobalPortletMetaData globalPortletMetaData = loadGlobalMetadata(globalPortletLocation);
+ globalPortletMetaData.mergeTo(md);
+ if (log.isDebugEnabled())
+ {
+ log.debug("Complete merging global portlet metadata to portlet application "
+ + webApp.getServletContext().getServletContextName());
+ }
+ }
+ catch (Exception ex)
+ {
+ if (log.isErrorEnabled())
+ {
+ log.error("Error during merge global portlet metadata to portlet application "
+ + webApp.getServletContext().getServletContextName(), ex);
+ }
+ }
+ }
+ else
+ {
+ log.warn("The global portlet metadata is not configured");
+ }
+
}
return md;
}
+
+ /**
+ * This method is invoked for each portlet application deployment. That is necessary for the moment
+ * to ensure independence between portlet applications
+ *
+ * @return
+ * @throws FileNotFoundException
+ * @throws JBossXBException
+ */
+ private GlobalPortletMetaData loadGlobalMetadata(String globalPortletLocation) throws FileNotFoundException,
+ JBossXBException
+ {
+ //TODO: Avoid using File
+ InputStream in = new FileInputStream(new File(globalPortletLocation));
+ try
+ {
+ return GlobalPortletMetaData.unmarshalling(in);
+ }
+ finally
+ {
+ Safe.close(in);
+ }
+ }
}
Copied: epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java (from rev 6437, portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java 2011-07-18 14:06:00 UTC (rev 6880)
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.portal.pc;
+
+import org.gatein.pc.mc.metadata.factory.PortletApplicationModelFactory;
+import org.gatein.pc.mc.metadata.impl.ValueTrimmingFilter;
+import org.gatein.pc.portlet.impl.metadata.PortletApplication10MetaData;
+import org.gatein.pc.portlet.impl.metadata.PortletApplication20MetaData;
+import org.gatein.pc.portlet.impl.metadata.filter.FilterMappingMetaData;
+import org.gatein.pc.portlet.impl.metadata.filter.FilterMetaData;
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a>
+ * @date 3/31/11
+ */
+public class GlobalPortletMetaData
+{
+ private PortletApplication10MetaData wrappedMetaData;
+
+ public GlobalPortletMetaData(PortletApplication10MetaData _wrappedMetaData)
+ {
+ this.wrappedMetaData = _wrappedMetaData;
+ }
+
+ public PortletApplication10MetaData mergeTo(PortletApplication10MetaData tobeMergedMetaData)
+ {
+ if(wrappedMetaData.getCustomPortletModes() != null)
+ {
+ tobeMergedMetaData.getCustomPortletModes().putAll(wrappedMetaData.getCustomPortletModes());
+ }
+
+ if(wrappedMetaData.getCustomWindowStates() != null)
+ {
+ tobeMergedMetaData.getCustomWindowStates().putAll(wrappedMetaData.getCustomWindowStates());
+ }
+
+ if(tobeMergedMetaData instanceof PortletApplication20MetaData && wrappedMetaData instanceof PortletApplication20MetaData)
+ {
+ return merge20MetData((PortletApplication20MetaData)wrappedMetaData, (PortletApplication20MetaData)tobeMergedMetaData);
+ }
+
+ return tobeMergedMetaData;
+
+ }
+
+ public PortletApplication10MetaData merge20MetData(PortletApplication20MetaData globalMetaData, PortletApplication20MetaData tobeMergedMetaData)
+ {
+ mergeFilterMetaData(globalMetaData, tobeMergedMetaData);
+ mergeFilterMapping(globalMetaData, tobeMergedMetaData);
+ mergePublicRenderParameters(globalMetaData, tobeMergedMetaData);
+
+ return tobeMergedMetaData;
+ }
+
+ private void mergeFilterMetaData(PortletApplication20MetaData globalMetaData, PortletApplication20MetaData tobeMergedMetaData)
+ {
+ Map<String, FilterMetaData> globalFilters = globalMetaData.getFilters();
+ Map<String, FilterMetaData> applicationFilters = tobeMergedMetaData.getFilters();
+
+ if(globalFilters != null)
+ {
+ if(applicationFilters == null)
+ {
+ tobeMergedMetaData.setFilters(globalFilters);
+ return;
+ }
+
+ applicationFilters.putAll(globalFilters);
+ tobeMergedMetaData.setFilters(applicationFilters);
+ }
+ }
+
+
+ private void mergeFilterMapping(PortletApplication20MetaData globalMetaData, PortletApplication20MetaData tobeMergedMetaData)
+ {
+ List<FilterMappingMetaData> applicationFilterMappings = tobeMergedMetaData.getFilterMapping();
+ if(applicationFilterMappings == null)
+ {
+ applicationFilterMappings = new ArrayList<FilterMappingMetaData>(3);
+ }
+
+ Map<String, FilterMetaData> globalFilters = globalMetaData.getFilters();
+ if(globalFilters == null)
+ {
+ return;
+ }
+ else
+ {
+ //TODO: Ensure there is no duplicated filter mapping
+ for(String filterName : globalFilters.keySet())
+ {
+ FilterMappingMetaData filterMapping = new FilterMappingMetaData();
+ filterMapping.setName(filterName);
+
+ //TODO: Use this list, examine if there is a bug in PC on the instantiation of filter mappings
+ //List<String> portletsApplyingThisGlobalFilter = findPortletsApplyingGlobalFilter(globalFilters.get(filterName), tobeMergedMetaData);
+
+ List<String> portletsApplyingThisGlobalFilter = new ArrayList<String>(3);
+ portletsApplyingThisGlobalFilter.add("*");
+ filterMapping.setPortletNames(portletsApplyingThisGlobalFilter);
+ applicationFilterMappings.add(filterMapping);
+ }
+
+ tobeMergedMetaData.setFilterMapping(applicationFilterMappings);
+ }
+
+ }
+
+ private void mergePublicRenderParameters(PortletApplication20MetaData globalMetaData, PortletApplication20MetaData tobeMergedMetaData)
+ {
+ //TODO: Wait for the spec of merging public render parameters
+ }
+
+ public static GlobalPortletMetaData unmarshalling(InputStream in) throws JBossXBException
+ {
+ Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ unmarshaller.setNamespaceAware(true);
+ unmarshaller.setSchemaValidation(false);
+ unmarshaller.setValidation(false);
+
+ PortletApplicationModelFactory factory = new PortletApplicationModelFactory();
+
+ PortletApplication10MetaData application10MetaData = (PortletApplication10MetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory), null);
+
+ return new GlobalPortletMetaData(application10MetaData);
+ }
+}
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/assemble.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -28,6 +28,10 @@
<directory>src/main/resources/deploy</directory>
<outputDirectory>deploy</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>src/main/resources/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ </fileSet>
</fileSets>
<moduleSets>
@@ -69,4 +73,4 @@
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -15,7 +15,7 @@
<name>Distribution</name>
<properties>
- <eap.version>5.1.1.ER2</eap.version>
+ <eap.version>5.1.1.CR1</eap.version>
<eap.groupId>org.jboss.jbossas</eap.groupId>
<eap.dir>jboss-eap-5.1</eap.dir>
<epp.dir>jboss-epp-5.2</epp.dir>
@@ -45,4 +45,4 @@
</modules>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Copied: epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml (from rev 6452, portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/portlet.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+
+ <!-- This filter collects runtime request statistics -->
+ <filter>
+ <filter-name>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-name>
+ <filter-class>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ <lifecycle>EVENT_PHASE</lifecycle>
+ <lifecycle>RESOURCE_PHASE</lifecycle>
+ </filter>
+
+</portlet-app>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.dashboard.webui.component.UIDashboardPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.dashboard.webui.component.UITabbedDashboardPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.gadget.webui.component.UIGadgetPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.account.webui.component.UIAccountPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.toolbar.webui.component.UIAdminToolbarPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -27,7 +27,6 @@
<ui-component-root>org.exoplatform.applicationregistry.webui.component.UIApplicationRegistryPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.navigation.webui.component.UIGroupNavigationPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -27,7 +27,6 @@
<ui-component-root>org.exoplatform.organization.webui.component.UIOrganizationPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.navigation.webui.component.UIPageManagementPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.navigation.webui.component.UIPortalNavigationPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.account.webui.component.UIRegisterPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.toolbar.webui.component.UIStarToolbarPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -27,7 +27,6 @@
<ui-component-root>org.exoplatform.toolbar.webui.component.UIUserInfoPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -27,7 +27,6 @@
<ui-component-root>org.exoplatform.toolbar.webui.component.UIUserToolBarDashboardPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -27,7 +27,6 @@
<ui-component-root>org.exoplatform.toolbar.webui.component.UIUserToolBarGroupPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -27,7 +27,6 @@
<ui-component-root>org.exoplatform.toolbar.webui.component.UIUserToolBarPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -27,7 +27,6 @@
<ui-component-root>org.exoplatform.toolbar.webui.component.UIUserToolBarSitePortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -30,7 +30,6 @@
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
- </application-lifecycle-listeners>
+ </application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.portal.webui.component.UIBreadcumbsPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.fck.webui.component.UIFCKEditorPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -29,7 +29,6 @@
<ui-component-root>org.exoplatform.portal.webui.application.UIGroovyPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.portal.webui.application.UIGroovyPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.portal.webui.component.UIIFramePortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -27,7 +27,6 @@
<ui-component-root>org.exoplatform.groovy.webui.component.UILoginPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.portal.webui.component.UILogoPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.portal.webui.component.UINavigationPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.portal.webui.component.UIPortalNavigationPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -24,7 +24,6 @@
<ui-component-root>org.exoplatform.portal.webui.component.UISitemapPortlet</ui-component-root>
<state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
<application-lifecycle-listeners>
- <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
</application-lifecycle-listeners>
</application>
</webui-configuration>
Modified: epp/portal/branches/EPP_5_2_Branch/settings-all.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/settings-all.xml 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/settings-all.xml 2011-07-18 14:06:00 UTC (rev 6880)
@@ -16,8 +16,9 @@
<!--pluginGroups>
<pluginGroup>org.codehaus.mojo</pluginGroup>
</pluginGroups-->
+<!--
<localRepository>${env.HOME}/.m2_EPP</localRepository>
-
+-->
<profiles>
<profile>
<id>my-jboss-maven2</id>
Copied: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java (from rev 6437, portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java)
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java 2011-07-18 14:06:00 UTC (rev 6880)
@@ -0,0 +1,120 @@
+package org.exoplatform.portal.application;
+
+import org.exoplatform.container.PortalContainer;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.filter.ActionFilter;
+import javax.portlet.filter.EventFilter;
+import javax.portlet.filter.FilterChain;
+import javax.portlet.filter.FilterConfig;
+import javax.portlet.filter.RenderFilter;
+import javax.portlet.filter.ResourceFilter;
+import java.io.IOException;
+
+/**
+ * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a>
+ * @date 4/5/11
+ */
+public class ApplicationMonitoringFilter implements ActionFilter, RenderFilter, EventFilter, ResourceFilter
+{
+
+ public void init(FilterConfig cfg) throws PortletException
+ {
+ }
+
+ public void destroy()
+ {
+ }
+
+ public void doFilter(ActionRequest req, ActionResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ ApplicationStatistic stat = get(req);
+ if (stat != null)
+ {
+ long t = -System.currentTimeMillis();
+ chain.doFilter(req, resp);
+ t += System.currentTimeMillis();
+ stat.logTime(t);
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+ }
+
+ public void doFilter(EventRequest req, EventResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ ApplicationStatistic stat = get(req);
+ if (stat != null)
+ {
+ long t = -System.currentTimeMillis();
+ chain.doFilter(req, resp);
+ t += System.currentTimeMillis();
+ stat.logTime(t);
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+ }
+
+ public void doFilter(RenderRequest req, RenderResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ ApplicationStatistic stat = get(req);
+ if (stat != null)
+ {
+ long t = -System.currentTimeMillis();
+ chain.doFilter(req, resp);
+ t += System.currentTimeMillis();
+ stat.logTime(t);
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+ }
+
+ public void doFilter(ResourceRequest req, ResourceResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ ApplicationStatistic stat = get(req);
+ if (stat != null)
+ {
+ long t = -System.currentTimeMillis();
+ chain.doFilter(req, resp);
+ t += System.currentTimeMillis();
+ stat.logTime(t);
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+ }
+
+ private ApplicationStatistic get(PortletRequest req) throws IOException, PortletException
+ {
+ PortalContainer container = PortalContainer.getInstance();
+ ApplicationStatisticService service = (ApplicationStatisticService)container.getComponentInstance(ApplicationStatisticService.class);
+ if (service != null)
+ {
+ PortletConfig portletConfig = (PortletConfig)req.getAttribute("javax.portlet.config");
+ String portletName = portletConfig.getPortletName();
+ String phase = (String)req.getAttribute(PortletRequest.LIFECYCLE_PHASE);
+ String applicationId = portletName + "/" + phase;
+ return service.getApplicationStatistic(applicationId);
+ }
+ else
+ {
+ return null;
+ }
+ }
+}
Deleted: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java 2011-07-18 13:04:18 UTC (rev 6879)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java 2011-07-18 14:06:00 UTC (rev 6880)
@@ -1,67 +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.application;
-
-import org.exoplatform.web.application.Application;
-import org.exoplatform.web.application.ApplicationLifecycle;
-import org.exoplatform.web.application.RequestFailure;
-import org.exoplatform.webui.application.WebuiRequestContext;
-
-public class PortletStatisticLifecycle implements ApplicationLifecycle<WebuiRequestContext>
-{
-
- private static final String ATTRIBUTE_NAME = "AppStatistic";
-
- @SuppressWarnings("unused")
- public void onInit(Application app)
- {
-
- }
-
- @SuppressWarnings("unused")
- public void onStartRequest(Application app, WebuiRequestContext context) throws Exception
- {
- app.setAttribute(ATTRIBUTE_NAME, System.currentTimeMillis());
- }
-
- @SuppressWarnings("unused")
- public void onFailRequest(Application app, WebuiRequestContext context, RequestFailure failureType) throws Exception
- {
-
- }
-
- @SuppressWarnings("unused")
- public void onEndRequest(Application app, WebuiRequestContext context) throws Exception
- {
- ApplicationStatisticService service =
- (ApplicationStatisticService)app.getApplicationServiceContainer().getComponentInstanceOfType(
- ApplicationStatisticService.class);
- ApplicationStatistic appStatistic = service.getApplicationStatistic(app.getApplicationId());
- long startTime = Long.valueOf(app.getAttribute(ATTRIBUTE_NAME).toString());
- appStatistic.logTime(System.currentTimeMillis() - startTime);
- }
-
- @SuppressWarnings("unused")
- public void onDestroy(Application app)
- {
-
- }
-
-}
\ No newline at end of file
13 years, 6 months
- 1
- 0
gatein SVN: r6879 - epp/portal/branches/EPP_5_2_Branch/distribution.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-18 09:04:18 -0400 (Mon, 18 Jul 2011)
New Revision: 6879
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
Log:
JBEPP-970 Upgrade portletbridge to 2.1.1.GA.EPP51
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-07-18 10:54:16 UTC (rev 6878)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-07-18 13:04:18 UTC (rev 6879)
@@ -29,7 +29,7 @@
<epp.doc.directory>jboss-epp-doc-5.1</epp.doc.directory>
<sso.version>1.0.2-epp-DEV01</sso.version>
- <portletbridge.version>2.1.0.GA.EPP51</portletbridge.version>
+ <portletbridge.version>2.1.1.GA.EPP51</portletbridge.version>
</properties>
13 years, 6 months
- 1
- 0
gatein SVN: r6878 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hanh.ly
Date: 2011-07-18 06:54:16 -0400 (Mon, 18 Jul 2011)
New Revision: 6878
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html
Log:
TESTVN-3813
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -121,11 +121,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-<tr>
- <td>verifyElementPresent</td>
- <td>//ul[@id='PortalNavigationTopContainer']/li[2]/span/a</td>
- <td></td>
-</tr>
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -283,26 +283,16 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Link</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
- <td></td>
-</tr>
-<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>//a[@title='Quick Search']</td>
<td></td>
</tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -278,101 +278,26 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div[2]/div/div/div[3]/div/a</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div//a[@title='SiteMap']</td>
<td></td>
</tr>
<tr>
<td>mouseDownRight</td>
- <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div[2]/div/div/div[3]/div/a</td>
+ <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div//a[@title='SiteMap']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div[7]/a</td>
+ <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[7]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/div/div/div[7]/a</td>
+ <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[7]/a</td>
<td></td>
</tr>
<tr>
<td>echo</td>
- <td>-- Clone node--</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div[2]/div/div/div[2]/div[2]/div/div</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>//html/body/div/div[2]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[4]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div[2]/div/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/div[2]/div/div/div[2]/div[2]/div/div</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_32']</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseDownRight</td>
- <td>//a[@class='NodeIcon DefaultPageIcon NodeSelected' and @title='Test_SNF_PRL_32']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Clone Node</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>link=Clone Node</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[1]/a</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@class='HomeNode']</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseDownRight</td>
- <td>//div[@class='HomeNode']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Paste Node</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>link=Paste Node</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
<td>--Move node up</td>
<td></td>
</tr>
@@ -601,21 +526,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-<tr>
- <td>click</td>
- <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td>
- <td></td>
-</tr>
-<tr>
- <td>type</td>
- <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td>
- <td>ddd</td>
-</tr>
-<tr>
- <td>click</td>
- <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
- <td></td>
-</tr>
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33_EditNodePageProperties.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -123,26 +123,16 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Community Management</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
- <td></td>
-</tr>
-<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>//a[@title='Quick Search']</td>
<td></td>
</tr>
@@ -192,16 +182,6 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAndWait</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
<td>waitForTextPresent</td>
<td>Test_SNF_PRL_33</td>
<td></td>
@@ -337,12 +317,7 @@
<td></td>
</tr>
<tr>
- <td>clickAndWait</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>assertLocation</td>
+ <td>open</td>
<td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_33</td>
<td></td>
</tr>
@@ -472,12 +447,7 @@
<td></td>
</tr>
<tr>
- <td>clickAndWait</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>assertLocation</td>
+ <td>open</td>
<td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_33</td>
<td></td>
</tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -122,27 +122,22 @@
<td></td>
</tr>
<tr>
+ <td>waitForText</td>
+ <td>link=Test_SNF_PRL_34</td>
+ <td>Test_SNF_PRL_34</td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Community Management</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
- <td></td>
-</tr>
-<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>//a[@title='Quick Search']</td>
<td></td>
</tr>
@@ -192,16 +187,6 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAndWait</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
<td>waitForTextPresent</td>
<td>Test_SNF_PRL_34</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_39_AddNewpageForGroup.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_39</td>
</tr>
<tr>
@@ -103,12 +103,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -118,12 +118,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -142,7 +142,7 @@
<td></td>
</tr>
<tr>
- <td>assertLocation</td>
+ <td>open</td>
<td>http://localhost:8080/portal/private/classic/administration/Test_SNF_PRL_39</td>
<td></td>
</tr>
@@ -163,13 +163,13 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td>
- <td>Edit Navigation</td>
+ <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td>
+ <td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td>
- <td>Edit Navigation</td>
+ <td>//div[@id='UIGroupNavigationGrid']/table/tbody/tr/td[3]/a</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
@@ -243,32 +243,27 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Test_SNF_PRL_39</td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>searchOption</td>
- <td></td>
-</tr>
-<tr>
<td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
+ <td>name=searchOption</td>
+ <td>label=group</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@title="Quick Search"]</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//a[@title="Quick Search"]</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -308,12 +303,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_40_EditPageForGroup.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_40</td>
</tr>
<tr>
@@ -103,12 +103,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -118,12 +118,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -142,7 +142,7 @@
<td></td>
</tr>
<tr>
- <td>assertLocation</td>
+ <td>open</td>
<td>http://localhost:8080/portal/private/classic/organization/Test_SNF_PRL_40</td>
<td></td>
</tr>
@@ -543,6 +543,16 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>//table[2]/tbody/tr/td[3]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//table[2]/tbody/tr/td[3]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_SNF_PRL_40']</td>
<td></td>
</tr>
@@ -593,32 +603,27 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Test_SNF_PRL_40</td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>searchOption</td>
- <td></td>
-</tr>
-<tr>
<td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
+ <td>name=searchOption</td>
+ <td>label=group</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@title='Quick Search']</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//a[@title='Quick Search']</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -658,12 +663,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_41_ChangeSiteConfigWhenEditlayOutForGroupPage.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_41</td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_42</td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_43_ChangeApplicationWhenEditLayoutForGroupPage.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_43</td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_44</td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -138,32 +138,32 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/input</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/input</td>
<td>New Account</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
+ <td>name=searchOption</td>
<td></td>
</tr>
<tr>
<td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
+ <td>name=searchOption</td>
+ <td>label=group</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//a[@title="Quick Search"]</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//a[@title="Quick Search"]</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-07-18 09:59:38 UTC (rev 6877)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-07-18 10:54:16 UTC (rev 6878)
@@ -261,11 +261,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-<tr>
- <td>waitForText</td>
- <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
- <td></td>
-</tr>
</tbody></table>
</body>
</html>
13 years, 6 months
- 1
- 0
gatein SVN: r6877 - in epp/portal/branches/EPP_5_1_Branch: web/portal/src/main/webapp/WEB-INF/conf/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-07-18 05:59:38 -0400 (Mon, 18 Jul 2011)
New Revision: 6877
Added:
epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/ConstantUserNavigationsDataStorageImpl.java
Modified:
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
JBEPP-1010
Optional DataStorage Implementation optimized when user dashboards aren't used
Added: epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/ConstantUserNavigationsDataStorageImpl.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/ConstantUserNavigationsDataStorageImpl.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/ConstantUserNavigationsDataStorageImpl.java 2011-07-18 09:59:38 UTC (rev 6877)
@@ -0,0 +1,67 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2011, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.exoplatform.portal.config;
+
+import org.exoplatform.portal.config.DataStorageImpl;
+import org.exoplatform.portal.config.model.PageNavigation;
+import org.exoplatform.portal.config.model.PortalConfig;
+import org.exoplatform.portal.pom.data.ModelDataStorage;
+import org.exoplatform.services.listener.ListenerService;
+
+/**
+ * This implementation can make performance improvement for concurrent login of many users.
+ * But it can be used only with disabled dashboard. Dashboard can't work correctly with this implementation!!!
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ * @version $Revision$
+ */
+public class ConstantUserNavigationsDataStorageImpl extends DataStorageImpl
+{
+
+ public ConstantUserNavigationsDataStorageImpl(ModelDataStorage delegate, ListenerService listenerServ)
+ {
+ super(delegate, listenerServ);
+ }
+
+ /**
+ * return constant Navigation if required owner type is "user" and don't try to load it from mop. This navigation does not have any navigation nodes.
+ *
+ */
+ public PageNavigation getPageNavigation(String ownerType, String id) throws Exception
+ {
+ if (PortalConfig.USER_TYPE.equals(ownerType))
+ {
+ PageNavigation nav = new PageNavigation();
+ nav.setOwnerType(ownerType);
+ nav.setOwnerId(id);
+ nav.setPriority(3);
+ return nav;
+ }
+ else
+ {
+ return super.getPageNavigation(ownerType, id);
+ }
+ }
+
+}
+
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-07-17 16:33:30 UTC (rev 6876)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-07-18 09:59:38 UTC (rev 6877)
@@ -38,6 +38,10 @@
<component>
<key>org.exoplatform.portal.config.DataStorage</key>
<type>org.exoplatform.portal.config.DataStorageImpl</type>
+ <!--
+ Optimization when the dashboards aren't used: You can replace the implementation by:
+ <type>org.exoplatform.portal.config.ConstantUserNavigationsDataStorageImpl</type>
+ -->
</component>
<component>
13 years, 6 months
- 1
- 0
gatein SVN: r6876 - in portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl: portal and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-17 12:33:30 -0400 (Sun, 17 Jul 2011)
New Revision: 6876
Added:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/AdaptedIterableResult.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/AdaptedIterator.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/Adaptor.java
Modified:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/NavigationImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java
Log:
- Adapted to API changes.
- Added util package with AdaptedIterableResult, AdapterIterator and Adaptor classes meant to convert between MOP and API data.
- Implemented NavigationImpl.getAll.
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-16 07:12:30 UTC (rev 6875)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-17 16:33:30 UTC (rev 6876)
@@ -36,8 +36,6 @@
import org.exoplatform.portal.pom.data.PortalData;
import org.exoplatform.portal.pom.data.PortalKey;
import org.gatein.api.GateIn;
-import org.gatein.api.IterableResult;
-import org.gatein.api.ParameterValidation;
import org.gatein.api.content.Application;
import org.gatein.api.content.Content;
import org.gatein.api.content.Gadget;
@@ -48,11 +46,13 @@
import org.gatein.api.portal.Page;
import org.gatein.api.portal.Portal;
import org.gatein.api.portal.Site;
+import org.gatein.api.util.IterableResult;
+import org.gatein.api.util.ParameterValidation;
import org.gatein.portal.api.impl.portal.PortalImpl;
+import org.gatein.portal.api.impl.util.AdaptedIterableResult;
import org.picocontainer.Startable;
import java.net.URI;
-import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
@@ -82,7 +82,18 @@
begin();
final List<PortalData> portals = dataStorage.find(PORTALS).getAll();
- return new PortalIterableResult(portals);
+ return new AdaptedIterableResult<PortalData, Portal>(portals.size(), portals.iterator())
+ {
+ public Portal adapt(PortalData old)
+ {
+ return new PortalImpl(old, GateInImpl.this);
+ }
+
+ public boolean contains(Id<Portal> id)
+ {
+ return getPortalDataFor(id) != null;
+ }
+ };
}
catch (Exception e)
{
@@ -249,60 +260,4 @@
{
RequestLifeCycle.begin(container);
}
-
- private static class PortalIterator implements Iterator<Portal>
- {
- private int current;
- private int size;
- private final List<PortalData> portals;
- private final GateInImpl gateIn;
-
- public PortalIterator(List<PortalData> portals, GateInImpl gateIn)
- {
- this.portals = portals;
- size = portals.size();
- this.gateIn = gateIn;
- }
-
-
- public boolean hasNext()
- {
- return current > size;
- }
-
- public Portal next()
- {
- return new PortalImpl(portals.get(current++), gateIn);
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
- }
-
- private class PortalIterableResult implements IterableResult<Portal>
- {
- private final List<PortalData> portals;
-
- public PortalIterableResult(List<PortalData> portals)
- {
- this.portals = portals;
- }
-
- public int size()
- {
- return portals.size();
- }
-
- public boolean contains(Id<Portal> id)
- {
- return getPortalDataFor(id) != null;
- }
-
- public Iterator<Portal> iterator()
- {
- return new PortalIterator(portals, GateInImpl.this);
- }
- }
}
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/NavigationImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/NavigationImpl.java 2011-07-16 07:12:30 UTC (rev 6875)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/NavigationImpl.java 2011-07-17 16:33:30 UTC (rev 6876)
@@ -25,17 +25,18 @@
import org.exoplatform.portal.mop.navigation.NodeContext;
import org.exoplatform.portal.mop.navigation.NodeModel;
import org.exoplatform.portal.mop.navigation.NodeState;
-import org.gatein.api.Filter;
import org.gatein.api.GateIn;
-import org.gatein.api.IterableResult;
-import org.gatein.api.Query;
import org.gatein.api.id.Context;
import org.gatein.api.id.Id;
import org.gatein.api.id.Identifiable;
import org.gatein.api.portal.Navigation;
import org.gatein.api.portal.Page;
import org.gatein.api.portal.Site;
+import org.gatein.api.util.Filter;
+import org.gatein.api.util.IterableResult;
+import org.gatein.api.util.Query;
import org.gatein.portal.api.impl.GateInImpl;
+import org.gatein.portal.api.impl.util.AdaptedIterableResult;
import java.util.Iterator;
import java.util.regex.Pattern;
@@ -96,8 +97,18 @@
public IterableResult<Navigation> getAll()
{
-// context.getNodes()
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return new AdaptedIterableResult<NavigationImpl, Navigation>(size(), context.iterator())
+ {
+ public Navigation adapt(NavigationImpl old)
+ {
+ return old;
+ }
+
+ public boolean contains(Id<Navigation> t)
+ {
+ return context.get(t.toString()) != null;
+ }
+ };
}
public int size()
@@ -110,16 +121,36 @@
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+ public boolean contains(Id<Navigation> navigationId)
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
public Navigation createAndAdd(String key)
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ public Navigation createAndAdd(Id<Navigation> navigationId)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
public Navigation get(String key)
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ public Navigation get(Id<Navigation> navigationId)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Id<Navigation> getIdForChild(String key)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
public <U extends Navigation> IterableResult<U> getAllWhere(Filter<U> filter)
{
return null; //To change body of implemented methods use File | Settings | File Templates.
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java 2011-07-16 07:12:30 UTC (rev 6875)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java 2011-07-17 16:33:30 UTC (rev 6876)
@@ -29,12 +29,12 @@
import org.exoplatform.portal.mop.navigation.NodeModel;
import org.exoplatform.portal.mop.navigation.Scope;
import org.exoplatform.portal.pom.data.PortalData;
-import org.gatein.api.Container;
import org.gatein.api.content.ContentRegistry;
import org.gatein.api.portal.Navigation;
import org.gatein.api.portal.Page;
import org.gatein.api.portal.Portal;
import org.gatein.api.portal.Site;
+import org.gatein.api.util.Container;
import org.gatein.portal.api.impl.GateInImpl;
import org.gatein.portal.api.impl.IdentifiableImpl;
Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/AdaptedIterableResult.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/AdaptedIterableResult.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/AdaptedIterableResult.java 2011-07-17 16:33:30 UTC (rev 6876)
@@ -0,0 +1,57 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.portal.api.impl.util;
+
+import org.gatein.api.id.Identifiable;
+import org.gatein.api.util.IterableResult;
+
+import java.util.Iterator;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public abstract class AdaptedIterableResult<O, N extends Identifiable> implements IterableResult<N>, Adaptor<O, N>
+{
+ private final int size;
+ private final Iterator<O> adaptee;
+
+ public AdaptedIterableResult(int size, Iterator<O> adaptee)
+ {
+ this.size = size;
+ this.adaptee = adaptee;
+ }
+
+ public int size()
+ {
+ return size;
+ }
+
+ public Iterator<N> iterator()
+ {
+ return new AdaptedIterator<O, N>(adaptee)
+ {
+ public N adapt(O old)
+ {
+ return AdaptedIterableResult.this.adapt(old);
+ }
+ };
+ }
+}
Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/AdaptedIterator.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/AdaptedIterator.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/AdaptedIterator.java 2011-07-17 16:33:30 UTC (rev 6876)
@@ -0,0 +1,51 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.portal.api.impl.util;
+
+import java.util.Iterator;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public abstract class AdaptedIterator<O, N> implements Iterator<N>, Adaptor<O, N>
+{
+ private final Iterator<O> adaptee;
+
+ public AdaptedIterator(Iterator<O> adaptee)
+ {
+ this.adaptee = adaptee;
+ }
+
+ public boolean hasNext()
+ {
+ return adaptee.hasNext();
+ }
+
+ public N next()
+ {
+ return adapt(adaptee.next());
+ }
+
+ public void remove()
+ {
+ adaptee.remove();
+ }
+}
Added: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/Adaptor.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/Adaptor.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/util/Adaptor.java 2011-07-17 16:33:30 UTC (rev 6876)
@@ -0,0 +1,29 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.portal.api.impl.util;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public interface Adaptor<O, N>
+{
+ N adapt(O old);
+}
13 years, 6 months
- 1
- 0
gatein SVN: r6875 - in portal/trunk/component/portal/src/test: resources/conf and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-07-16 03:12:30 -0400 (Sat, 16 Jul 2011)
New Revision: 6875
Removed:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/i18n/
portal/trunk/component/portal/src/test/resources/conf/test-i18nframework-configuration.xml
Log:
GTNPORTAL-1960 Remove unuseful testcase for i18n framework
Deleted: portal/trunk/component/portal/src/test/resources/conf/test-i18nframework-configuration.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/conf/test-i18nframework-configuration.xml 2011-07-15 21:29:28 UTC (rev 6874)
+++ portal/trunk/component/portal/src/test/resources/conf/test-i18nframework-configuration.xml 2011-07-16 07:12:30 UTC (rev 6875)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ~ Copyright (C) 2011 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
- <component>
- <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
- <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
- </component>
-
- <external-component-plugins>
- <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
- <component-plugin>
- <name>Chromattic</name>
- <set-method>addLifeCycle</set-method>
- <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
- <init-params>
- <value-param>
- <name>domain-name</name>
- <value>i18n</value>
- </value-param>
- <value-param>
- <name>workspace-name</name>
- <value>portal-test</value>
- </value-param>
- <values-param>
- <name>entities</name>
- <value>org.exoplatform.portal.i18n.A</value>
- <value>org.exoplatform.portal.i18n.B</value>
- <value>org.exoplatform.portal.i18n.Described</value>
- <value>org.exoplatform.portal.i18n.NavigationNode</value>
- <value>org.exoplatform.portal.mop.i18n.I18Nized</value>
- <value>org.exoplatform.portal.mop.i18n.LanguageSpace</value>
- <value>org.exoplatform.portal.mop.i18n.Language</value>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
- <external-component-plugins>
- <target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
- <component-plugin>
- <name>add.namespaces</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
- <init-params>
- <properties-param>
- <name>namespaces</name>
- <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/" />
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>add.nodeType</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin
- </type>
- <init-params>
- <values-param>
- <name>autoCreatedInNewRepository</name>
- <description>Node types configuration file</description>
- <value>jar:/org/exoplatform/portal/i18n/nodetypes.xml</value>
- <value>jar:/org/exoplatform/portal/mop/i18n/nodetypes.xml</value>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-</configuration>
\ No newline at end of file
13 years, 6 months
- 1
- 0
gatein SVN: r6874 - in portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl: portal and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-15 17:29:28 -0400 (Fri, 15 Jul 2011)
New Revision: 6874
Added:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/NavigationImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java
Removed:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java
Modified:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
Log:
- Moved NavigationImpl and PortalImpl to portal package.
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-15 21:24:39 UTC (rev 6873)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-15 21:29:28 UTC (rev 6874)
@@ -48,6 +48,7 @@
import org.gatein.api.portal.Page;
import org.gatein.api.portal.Portal;
import org.gatein.api.portal.Site;
+import org.gatein.portal.api.impl.portal.PortalImpl;
import org.picocontainer.Startable;
import java.net.URI;
@@ -93,7 +94,7 @@
}
}
- void end()
+ public void end()
{
RequestLifeCycle.end();
}
@@ -215,12 +216,12 @@
// nothing to do
}
- ModelDataStorage getDataStorage()
+ public ModelDataStorage getDataStorage()
{
return dataStorage;
}
- NavigationService getNavigationService()
+ public NavigationService getNavigationService()
{
return navigationService;
}
@@ -244,7 +245,7 @@
}
}
- void begin()
+ public void begin()
{
RequestLifeCycle.begin(container);
}
Deleted: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java 2011-07-15 21:24:39 UTC (rev 6873)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java 2011-07-15 21:29:28 UTC (rev 6874)
@@ -1,178 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-package org.gatein.portal.api.impl;
-
-import org.exoplatform.portal.mop.navigation.NodeContext;
-import org.exoplatform.portal.mop.navigation.NodeModel;
-import org.exoplatform.portal.mop.navigation.NodeState;
-import org.gatein.api.Filter;
-import org.gatein.api.GateIn;
-import org.gatein.api.IterableResult;
-import org.gatein.api.Query;
-import org.gatein.api.id.Context;
-import org.gatein.api.id.Id;
-import org.gatein.api.id.Identifiable;
-import org.gatein.api.portal.Navigation;
-import org.gatein.api.portal.Page;
-import org.gatein.api.portal.Site;
-
-import java.util.Iterator;
-import java.util.regex.Pattern;
-
-/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
-public class NavigationImpl implements Navigation, Identifiable<Navigation>
-{
- private final NodeContext<NavigationImpl> context;
- private Id<? extends Site> site;
- private Id<Navigation> id;
- private final GateInImpl gateIn;
-
- private final static Context CONTEXT = Context.builder().requiredComponent("navigation", Navigation.class, Pattern.compile("[a-z0-9]+")).build();
-
- public NavigationImpl(Id<Site> siteId, NodeContext<NavigationImpl> context, GateInImpl gateIn)
- {
- this.context = context;
- this.site = siteId;
- this.gateIn = gateIn;
- }
-
- @Override
- public String toString()
- {
- String s = "Navigation@" + getId() + " target:" + context.getState().getPageRef() + "\nchildren:\n";
- Iterator<NavigationImpl> children = context.iterator();
- while (children.hasNext())
- {
- s += " " + children.next() + "\n";
- }
- return s;
- }
-
- public NodeContext<NavigationImpl> getContext()
- {
- return context;
- }
-
- public Page getTargetPage()
- {
- return null;
- }
-
- public void setTargetPage(Page target)
- {
- setTargetPage(target.getId());
- }
-
- public void setTargetPage(Id<Page> targetId)
- {
- context.setState(new NodeState.Builder(context.getState()).pageRef(targetId.toString()).build());
- }
-
- public Site getSite()
- {
- return getGateIn().get(site);
- }
-
- public IterableResult<Navigation> getAll()
- {
-// context.getNodes()
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public int size()
- {
- return context.getNodeSize();
- }
-
- public boolean contains(String key)
- {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Navigation createAndAdd(String key)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Navigation get(String key)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public <U extends Navigation> IterableResult<U> getAllWhere(Filter<U> filter)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public <U extends Navigation> IterableResult<U> getAllSatisfying(Query<U> query)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Id<Navigation> getId()
- {
- if (id == null)
- {
- id = Id.create(CONTEXT, Navigation.class, context.getId());
- }
-
- return id;
- }
-
- public String getName()
- {
- return context.getName();
- }
-
- public String getDisplayName()
- {
- return getName();
- }
-
- public GateIn getGateIn()
- {
- return gateIn;
- }
-
- static class NavigationNodeModel implements NodeModel<NavigationImpl>
- {
- private final Id<Site> siteId;
- private final GateInImpl gateIn;
-
- NavigationNodeModel(Id<Site> siteId, GateInImpl gateIn)
- {
- this.siteId = siteId;
- this.gateIn = gateIn;
- }
-
- public NodeContext<NavigationImpl> getContext(NavigationImpl node)
- {
- return node.context;
- }
-
- public NavigationImpl create(NodeContext<NavigationImpl> context)
- {
- return new NavigationImpl(siteId, context, gateIn);
- }
- }
-}
Deleted: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-15 21:24:39 UTC (rev 6873)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-15 21:29:28 UTC (rev 6874)
@@ -1,106 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-package org.gatein.portal.api.impl;
-
-import org.exoplatform.portal.mop.SiteKey;
-import org.exoplatform.portal.mop.navigation.NavigationContext;
-import org.exoplatform.portal.mop.navigation.NavigationService;
-import org.exoplatform.portal.mop.navigation.NavigationState;
-import org.exoplatform.portal.mop.navigation.NodeModel;
-import org.exoplatform.portal.mop.navigation.Scope;
-import org.exoplatform.portal.pom.data.PortalData;
-import org.gatein.api.Container;
-import org.gatein.api.content.ContentRegistry;
-import org.gatein.api.portal.Navigation;
-import org.gatein.api.portal.Page;
-import org.gatein.api.portal.Portal;
-import org.gatein.api.portal.Site;
-
-/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
-public class PortalImpl extends IdentifiableImpl implements Portal
-{
-
- public PortalImpl(PortalData portal, GateInImpl gateIn)
- {
- super(gateIn.siteId(Site.Type.forName(portal.getKey().getType()), portal.getKey().getId()), portal.getName(), gateIn);
- }
-
- public ContentRegistry getContentRegistry()
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Container<String, Page> getPageRegistry()
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Navigation getNavigation()
- {
- GateInImpl gateIn = getGateInImpl();
- NavigationService service = gateIn.getNavigationService();
-
- try
- {
- gateIn.begin();
- NavigationContext navigation = service.loadNavigation(SiteKey.portal(getName()));
-
- NodeModel<NavigationImpl> nodeModel = new NavigationImpl.NavigationNodeModel(getId(), gateIn);
-
- return service.loadNode(nodeModel, navigation, Scope.CHILDREN, null).getNode();
- }
- finally
- {
- gateIn.end();
- }
- }
-
- public Type getType()
- {
- return Type.PORTAL;
- }
-
- public Navigation createNavigationTo(Page node, Navigation parent)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public int getPriority()
- {
- GateInImpl gateIn = getGateInImpl();
- NavigationService service = gateIn.getNavigationService();
-
- try
- {
- gateIn.begin();
- NavigationContext navigation = service.loadNavigation(SiteKey.portal(getName()));
-
- NavigationState state = navigation.getState();
- return state != null ? state.getPriority() : 1;
- }
- finally
- {
- gateIn.end();
- }
- }
-}
Copied: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/NavigationImpl.java (from rev 6873, portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java)
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/NavigationImpl.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/NavigationImpl.java 2011-07-15 21:29:28 UTC (rev 6874)
@@ -0,0 +1,179 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.portal.api.impl.portal;
+
+import org.exoplatform.portal.mop.navigation.NodeContext;
+import org.exoplatform.portal.mop.navigation.NodeModel;
+import org.exoplatform.portal.mop.navigation.NodeState;
+import org.gatein.api.Filter;
+import org.gatein.api.GateIn;
+import org.gatein.api.IterableResult;
+import org.gatein.api.Query;
+import org.gatein.api.id.Context;
+import org.gatein.api.id.Id;
+import org.gatein.api.id.Identifiable;
+import org.gatein.api.portal.Navigation;
+import org.gatein.api.portal.Page;
+import org.gatein.api.portal.Site;
+import org.gatein.portal.api.impl.GateInImpl;
+
+import java.util.Iterator;
+import java.util.regex.Pattern;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public class NavigationImpl implements Navigation, Identifiable<Navigation>
+{
+ private final NodeContext<NavigationImpl> context;
+ private Id<? extends Site> site;
+ private Id<Navigation> id;
+ private final GateInImpl gateIn;
+
+ private final static Context CONTEXT = Context.builder().requiredComponent("navigation", Navigation.class, Pattern.compile("[a-z0-9]+")).build();
+
+ public NavigationImpl(Id<Site> siteId, NodeContext<NavigationImpl> context, GateInImpl gateIn)
+ {
+ this.context = context;
+ this.site = siteId;
+ this.gateIn = gateIn;
+ }
+
+ @Override
+ public String toString()
+ {
+ String s = "Navigation@" + getId() + " target:" + context.getState().getPageRef() + "\nchildren:\n";
+ Iterator<NavigationImpl> children = context.iterator();
+ while (children.hasNext())
+ {
+ s += " " + children.next() + "\n";
+ }
+ return s;
+ }
+
+ public NodeContext<NavigationImpl> getContext()
+ {
+ return context;
+ }
+
+ public Page getTargetPage()
+ {
+ return null;
+ }
+
+ public void setTargetPage(Page target)
+ {
+ setTargetPage(target.getId());
+ }
+
+ public void setTargetPage(Id<Page> targetId)
+ {
+ context.setState(new NodeState.Builder(context.getState()).pageRef(targetId.toString()).build());
+ }
+
+ public Site getSite()
+ {
+ return getGateIn().get(site);
+ }
+
+ public IterableResult<Navigation> getAll()
+ {
+// context.getNodes()
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public int size()
+ {
+ return context.getNodeSize();
+ }
+
+ public boolean contains(String key)
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Navigation createAndAdd(String key)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Navigation get(String key)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public <U extends Navigation> IterableResult<U> getAllWhere(Filter<U> filter)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public <U extends Navigation> IterableResult<U> getAllSatisfying(Query<U> query)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Id<Navigation> getId()
+ {
+ if (id == null)
+ {
+ id = Id.create(CONTEXT, Navigation.class, context.getId());
+ }
+
+ return id;
+ }
+
+ public String getName()
+ {
+ return context.getName();
+ }
+
+ public String getDisplayName()
+ {
+ return getName();
+ }
+
+ public GateIn getGateIn()
+ {
+ return gateIn;
+ }
+
+ static class NavigationNodeModel implements NodeModel<NavigationImpl>
+ {
+ private final Id<Site> siteId;
+ private final GateInImpl gateIn;
+
+ NavigationNodeModel(Id<Site> siteId, GateInImpl gateIn)
+ {
+ this.siteId = siteId;
+ this.gateIn = gateIn;
+ }
+
+ public NodeContext<NavigationImpl> getContext(NavigationImpl node)
+ {
+ return node.context;
+ }
+
+ public NavigationImpl create(NodeContext<NavigationImpl> context)
+ {
+ return new NavigationImpl(siteId, context, gateIn);
+ }
+ }
+}
Copied: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java (from rev 6873, portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java)
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java (rev 0)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/portal/PortalImpl.java 2011-07-15 21:29:28 UTC (rev 6874)
@@ -0,0 +1,108 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.portal.api.impl.portal;
+
+import org.exoplatform.portal.mop.SiteKey;
+import org.exoplatform.portal.mop.navigation.NavigationContext;
+import org.exoplatform.portal.mop.navigation.NavigationService;
+import org.exoplatform.portal.mop.navigation.NavigationState;
+import org.exoplatform.portal.mop.navigation.NodeModel;
+import org.exoplatform.portal.mop.navigation.Scope;
+import org.exoplatform.portal.pom.data.PortalData;
+import org.gatein.api.Container;
+import org.gatein.api.content.ContentRegistry;
+import org.gatein.api.portal.Navigation;
+import org.gatein.api.portal.Page;
+import org.gatein.api.portal.Portal;
+import org.gatein.api.portal.Site;
+import org.gatein.portal.api.impl.GateInImpl;
+import org.gatein.portal.api.impl.IdentifiableImpl;
+
+/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
+public class PortalImpl extends IdentifiableImpl implements Portal
+{
+
+ public PortalImpl(PortalData portal, GateInImpl gateIn)
+ {
+ super(gateIn.siteId(Site.Type.forName(portal.getKey().getType()), portal.getKey().getId()), portal.getName(), gateIn);
+ }
+
+ public ContentRegistry getContentRegistry()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Container<String, Page> getPageRegistry()
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public Navigation getNavigation()
+ {
+ GateInImpl gateIn = getGateInImpl();
+ NavigationService service = gateIn.getNavigationService();
+
+ try
+ {
+ gateIn.begin();
+ NavigationContext navigation = service.loadNavigation(SiteKey.portal(getName()));
+
+ NodeModel<NavigationImpl> nodeModel = new NavigationImpl.NavigationNodeModel(getId(), gateIn);
+
+ return service.loadNode(nodeModel, navigation, Scope.CHILDREN, null).getNode();
+ }
+ finally
+ {
+ gateIn.end();
+ }
+ }
+
+ public Type getType()
+ {
+ return Type.PORTAL;
+ }
+
+ public Navigation createNavigationTo(Page node, Navigation parent)
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public int getPriority()
+ {
+ GateInImpl gateIn = getGateInImpl();
+ NavigationService service = gateIn.getNavigationService();
+
+ try
+ {
+ gateIn.begin();
+ NavigationContext navigation = service.loadNavigation(SiteKey.portal(getName()));
+
+ NavigationState state = navigation.getState();
+ return state != null ? state.getPriority() : 1;
+ }
+ finally
+ {
+ gateIn.end();
+ }
+ }
+}
13 years, 6 months
- 1
- 0
gatein SVN: r6873 - portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-07-15 17:24:39 -0400 (Fri, 15 Jul 2011)
New Revision: 6873
Modified:
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java
portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java
Log:
- Fixed loading of root Navigation in PortalImpl and started implementing Navigation.
- Implemented Portal.getPriority.
- Adapted for API changes.
- Modified Context to also handle Page Ids.
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-15 10:00:09 UTC (rev 6872)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/GateInImpl.java 2011-07-15 21:24:39 UTC (rev 6873)
@@ -30,7 +30,9 @@
import org.exoplatform.portal.config.Query;
import org.exoplatform.portal.mop.SiteType;
import org.exoplatform.portal.mop.navigation.NavigationService;
+import org.exoplatform.portal.pom.data.DashboardData;
import org.exoplatform.portal.pom.data.ModelDataStorage;
+import org.exoplatform.portal.pom.data.PageData;
import org.exoplatform.portal.pom.data.PortalData;
import org.exoplatform.portal.pom.data.PortalKey;
import org.gatein.api.GateIn;
@@ -43,6 +45,7 @@
import org.gatein.api.id.Context;
import org.gatein.api.id.Id;
import org.gatein.api.id.Identifiable;
+import org.gatein.api.portal.Page;
import org.gatein.api.portal.Portal;
import org.gatein.api.portal.Site;
import org.picocontainer.Startable;
@@ -56,8 +59,12 @@
public class GateInImpl implements GateIn, Startable
{
private static final Query<PortalData> PORTALS = new Query<PortalData>(SiteType.PORTAL.getName(), null, PortalData.class);
+ private static final Query<DashboardData> DASHBOARDS = new Query<DashboardData>(SiteType.USER.getName(), null, DashboardData.class);
+ private static final Query<PageData> GROUPS = new Query<PageData>(SiteType.GROUP.getName(), null, PageData.class);
public static final Context CONTEXT = Context.builder().requiredComponent("owner", Site.class, Pattern.compile("\\w+"))
- .requiredComponent("name", Portal.class, Pattern.compile("\\w+")).withDefaultSeparator("::").build();
+ .requiredComponent("portal", Portal.class, Pattern.compile("\\w+"))
+ .optionalComponent("page", Page.class, Pattern.compile("\\w+"))
+ .withDefaultSeparator("::").build();
private ExoContainer container;
private ModelDataStorage dataStorage;
private NavigationService navigationService;
@@ -99,7 +106,7 @@
public Portal getDefaultPortal()
{
- return getPortal(portalId(Site.Type.PORTAL, "classic")); // todo: check
+ return getPortal(siteId(Site.Type.PORTAL, "classic")); // todo: check
}
public IterableResult<Site> getSites()
@@ -152,7 +159,7 @@
return type.cast(result);
}
- public <T extends Site> Site getSite(Id<Site> siteId, Site.Type<T> type)
+ public <T extends Site> T getSite(Id<T> siteId, Site.Type<T> type)
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@@ -192,9 +199,9 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public Id<Portal> portalId(Site.Type siteType, String portalName)
+ public <T extends Site> Id<T> siteId(Site.Type<T> siteType, String portalName)
{
- return Id.create(CONTEXT, Portal.class, siteType.getName(), portalName);
+ return Id.create(CONTEXT, siteType.getValueType(), siteType.getName(), portalName);
}
public void start()
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java 2011-07-15 10:00:09 UTC (rev 6872)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/NavigationImpl.java 2011-07-15 21:24:39 UTC (rev 6873)
@@ -23,44 +23,85 @@
package org.gatein.portal.api.impl;
import org.exoplatform.portal.mop.navigation.NodeContext;
+import org.exoplatform.portal.mop.navigation.NodeModel;
+import org.exoplatform.portal.mop.navigation.NodeState;
import org.gatein.api.Filter;
+import org.gatein.api.GateIn;
import org.gatein.api.IterableResult;
import org.gatein.api.Query;
+import org.gatein.api.id.Context;
+import org.gatein.api.id.Id;
+import org.gatein.api.id.Identifiable;
import org.gatein.api.portal.Navigation;
import org.gatein.api.portal.Page;
import org.gatein.api.portal.Site;
+import java.util.Iterator;
+import java.util.regex.Pattern;
+
/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */
-public class NavigationImpl extends IdentifiableImpl<Navigation> implements Navigation
+public class NavigationImpl implements Navigation, Identifiable<Navigation>
{
- public NavigationImpl(NodeContext<?> navigation, GateInImpl gateIn)
+ private final NodeContext<NavigationImpl> context;
+ private Id<? extends Site> site;
+ private Id<Navigation> id;
+ private final GateInImpl gateIn;
+
+ private final static Context CONTEXT = Context.builder().requiredComponent("navigation", Navigation.class, Pattern.compile("[a-z0-9]+")).build();
+
+ public NavigationImpl(Id<Site> siteId, NodeContext<NavigationImpl> context, GateInImpl gateIn)
{
- super(null, navigation.getName(), gateIn);
+ this.context = context;
+ this.site = siteId;
+ this.gateIn = gateIn;
}
+ @Override
+ public String toString()
+ {
+ String s = "Navigation@" + getId() + " target:" + context.getState().getPageRef() + "\nchildren:\n";
+ Iterator<NavigationImpl> children = context.iterator();
+ while (children.hasNext())
+ {
+ s += " " + children.next() + "\n";
+ }
+ return s;
+ }
+
+ public NodeContext<NavigationImpl> getContext()
+ {
+ return context;
+ }
+
public Page getTargetPage()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public void setTargetPage(Page target)
{
- //To change body of implemented methods use File | Settings | File Templates.
+ setTargetPage(target.getId());
}
+ public void setTargetPage(Id<Page> targetId)
+ {
+ context.setState(new NodeState.Builder(context.getState()).pageRef(targetId.toString()).build());
+ }
+
public Site getSite()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return getGateIn().get(site);
}
public IterableResult<Navigation> getAll()
{
+// context.getNodes()
return null; //To change body of implemented methods use File | Settings | File Templates.
}
public int size()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return context.getNodeSize();
}
public boolean contains(String key)
@@ -87,4 +128,51 @@
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+
+ public Id<Navigation> getId()
+ {
+ if (id == null)
+ {
+ id = Id.create(CONTEXT, Navigation.class, context.getId());
+ }
+
+ return id;
+ }
+
+ public String getName()
+ {
+ return context.getName();
+ }
+
+ public String getDisplayName()
+ {
+ return getName();
+ }
+
+ public GateIn getGateIn()
+ {
+ return gateIn;
+ }
+
+ static class NavigationNodeModel implements NodeModel<NavigationImpl>
+ {
+ private final Id<Site> siteId;
+ private final GateInImpl gateIn;
+
+ NavigationNodeModel(Id<Site> siteId, GateInImpl gateIn)
+ {
+ this.siteId = siteId;
+ this.gateIn = gateIn;
+ }
+
+ public NodeContext<NavigationImpl> getContext(NavigationImpl node)
+ {
+ return node.context;
+ }
+
+ public NavigationImpl create(NodeContext<NavigationImpl> context)
+ {
+ return new NavigationImpl(siteId, context, gateIn);
+ }
+ }
}
Modified: portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java
===================================================================
--- portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-15 10:00:09 UTC (rev 6872)
+++ portal/branches/api/component/api-impl/src/main/java/org/gatein/portal/api/impl/PortalImpl.java 2011-07-15 21:24:39 UTC (rev 6873)
@@ -25,7 +25,7 @@
import org.exoplatform.portal.mop.SiteKey;
import org.exoplatform.portal.mop.navigation.NavigationContext;
import org.exoplatform.portal.mop.navigation.NavigationService;
-import org.exoplatform.portal.mop.navigation.NodeContext;
+import org.exoplatform.portal.mop.navigation.NavigationState;
import org.exoplatform.portal.mop.navigation.NodeModel;
import org.exoplatform.portal.mop.navigation.Scope;
import org.exoplatform.portal.pom.data.PortalData;
@@ -42,7 +42,7 @@
public PortalImpl(PortalData portal, GateInImpl gateIn)
{
- super(gateIn.portalId(Site.Type.forName(portal.getKey().getType()), portal.getKey().getId()), portal.getName(), gateIn);
+ super(gateIn.siteId(Site.Type.forName(portal.getKey().getType()), portal.getKey().getId()), portal.getName(), gateIn);
}
public ContentRegistry getContentRegistry()
@@ -57,21 +57,21 @@
public Navigation getNavigation()
{
- NavigationService service = getGateInImpl().getNavigationService();
+ GateInImpl gateIn = getGateInImpl();
+ NavigationService service = gateIn.getNavigationService();
try
{
- getGateInImpl().begin();
+ gateIn.begin();
NavigationContext navigation = service.loadNavigation(SiteKey.portal(getName()));
- //
- NodeContext<?> node = service.loadNode(NodeModel.SELF_MODEL, navigation, Scope.SINGLE, null).getNode();
+ NodeModel<NavigationImpl> nodeModel = new NavigationImpl.NavigationNodeModel(getId(), gateIn);
- return new NavigationImpl(node, getGateInImpl());
+ return service.loadNode(nodeModel, navigation, Scope.CHILDREN, null).getNode();
}
finally
{
- getGateInImpl().end();
+ gateIn.end();
}
}
@@ -87,6 +87,20 @@
public int getPriority()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ GateInImpl gateIn = getGateInImpl();
+ NavigationService service = gateIn.getNavigationService();
+
+ try
+ {
+ gateIn.begin();
+ NavigationContext navigation = service.loadNavigation(SiteKey.portal(getName()));
+
+ NavigationState state = navigation.getState();
+ return state != null ? state.getPriority() : 1;
+ }
+ finally
+ {
+ gateIn.end();
+ }
}
}
13 years, 6 months
- 1
- 0
gatein SVN: r6872 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hanh.ly
Date: 2011-07-15 06:00:09 -0400 (Fri, 15 Jul 2011)
New Revision: 6872
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html
Log:
TESTVN-3813
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10_AddUserIntoGroup.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -118,12 +118,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[contains(text(),'Add')]</td>
+ <td>link=Add</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[contains(text(),'Add')]</td>
+ <td>link=Add</td>
<td></td>
</tr>
<tr>
@@ -186,6 +186,11 @@
<td>link=Sign out</td>
<td></td>
</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td></td>
+ <td></td>
+</tr>
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_LinkToGadget.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -58,12 +58,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td>
+ <td>//ul[@id='PortalNavigationTopContainer']/li[2]/span/a</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td>
+ <td>//ul[@id='PortalNavigationTopContainer']/li[2]/span/a</td>
<td></td>
</tr>
<tr>
@@ -121,6 +121,11 @@
<td>link=Sign out</td>
<td></td>
</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>//ul[@id='PortalNavigationTopContainer']/li[2]/span/a</td>
+ <td></td>
+</tr>
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_DeletePortal.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -103,12 +103,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -118,12 +118,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -178,12 +178,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/table/tbody/tr/td/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/table/tbody/tr/td/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_ChangeUsingPortal.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -83,22 +83,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[5]/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[1]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[3]/div[1]/div[1]/div/div/div[1]/div[2]/div[2]/div/div/div</td>
+ <td>//form[@id='UIPortalForm']/div[3]/div[1]/div[4]/div/div/div[1]/div[2]/div[2]/div/div/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[3]/div[1]/div[1]/div/div/div[1]/div[2]/div[2]/div/div/div</td>
+ <td>//form[@id='UIPortalForm']/div[3]/div[1]/div[4]/div/div/div[1]/div[2]/div[2]/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -108,12 +108,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -123,12 +123,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[4]/div/div/div/div</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -183,12 +183,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/table/tbody/tr/td/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/table/tbody/tr/td/div[2]/div/div/div/div</td>
+ <td>//div[@id='UIPermissionSelector']/div/div[2]/div[2]/span[2]/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_29_AddNewpageForPortal.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -88,7 +88,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_29</td>
</tr>
<tr>
@@ -98,12 +98,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -113,12 +113,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -137,7 +137,7 @@
<td></td>
</tr>
<tr>
- <td>assertLocation</td>
+ <td>open</td>
<td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_29</td>
<td></td>
</tr>
@@ -238,32 +238,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Test_SNF_PRL_29</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//form[@id='UIPageSearch']//a[@title='Quick Search']</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']//a[@title='Quick Search']</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -303,12 +293,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_30_EditPageForPortal.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -88,7 +88,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_30</td>
</tr>
<tr>
@@ -98,12 +98,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -113,12 +113,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -137,7 +137,7 @@
<td></td>
</tr>
<tr>
- <td>assertLocation</td>
+ <td>open</td>
<td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_30</td>
<td></td>
</tr>
@@ -593,26 +593,16 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Test_SNF_PRL_30</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
- <td></td>
-</tr>
-<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>//a[@title='Quick Search']</td>
<td></td>
</tr>
@@ -658,12 +648,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31_ManageNodePortal.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -133,26 +133,16 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Group Navigation</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
- <td></td>
-</tr>
-<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
<td>//a[@title='Quick Search']</td>
<td></td>
</tr>
@@ -202,16 +192,6 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAndWait</td>
- <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
- <td></td>
-</tr>
-<tr>
<td>waitForTextPresent</td>
<td>Test_SNF_PRL_31</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -123,32 +123,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td>
<td>Group Navigation</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
+ <td>//a[@title="Quick Search"]</td>
<td></td>
</tr>
<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//form[@id='UIPageSearch']//a[@title="Quick Search"]</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']//a[@title="Quick Search"]</td>
+ <td>//a[@title="Quick Search"]</td>
<td></td>
</tr>
<tr>
@@ -611,6 +601,21 @@
<td>link=Sign out</td>
<td></td>
</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/input[1]</td>
+ <td>ddd</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
+ <td></td>
+</tr>
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -83,7 +83,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_58</td>
</tr>
<tr>
@@ -93,12 +93,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -108,12 +108,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -132,7 +132,7 @@
<td></td>
</tr>
<tr>
- <td>assertLocation</td>
+ <td>open</td>
<td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_58</td>
<td></td>
</tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -83,7 +83,7 @@
</tr>
<tr>
<td>type</td>
- <td>pageDisplayName</td>
+ <td>i18nizedLabel</td>
<td>Test_SNF_PRL_59</td>
</tr>
<tr>
@@ -93,12 +93,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -108,12 +108,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -288,12 +288,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -328,12 +328,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[2]/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -368,12 +368,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[2]/div/div/div/div/a/img</td>
+ <td>//div[@id='UITabPaneDashboard']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UITabPaneDashboard']/div/div/div/div/div/div[2]/div/div/div/div/a/img</td>
+ <td>//div[@id='UITabPaneDashboard']/div[2]/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_60_ShowAndSearchPage.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -68,32 +68,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Home Page</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -113,22 +103,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -271,6 +261,11 @@
<td>link=Sign out</td>
<td></td>
</tr>
+<tr>
+ <td>waitForText</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
+ <td></td>
+</tr>
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_61_ManagePageOfPortal.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -188,12 +188,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Test_SNF_PRL_61</td>
</tr>
<tr>
@@ -204,16 +204,16 @@
<tr>
<td>select</td>
<td>searchOption</td>
- <td>label=Title</td>
+ <td>label=portal</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -318,12 +318,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_62_ManagePageOfGroup.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -213,32 +213,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Test_SNF_PRL_62</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -308,22 +298,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Test_SNF_PRL_62_edit</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -363,12 +353,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[5]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_63_ManagePageOfUser.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -133,32 +133,22 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td></td>
</tr>
<tr>
<td>type</td>
- <td>searchTerm</td>
+ <td>pageTitle</td>
<td>Test_SNF_PRL_63</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>searchOption</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
- <td>select</td>
- <td>searchOption</td>
- <td>label=Title</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
- <td></td>
-</tr>
-<tr>
<td>click</td>
- <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
@@ -291,6 +281,11 @@
<td>link=Sign out</td>
<td></td>
</tr>
+<tr>
+ <td>verifyText</td>
+ <td>//form[@id='UIPageSearchForm']/div[2]/a</td>
+ <td></td>
+</tr>
</tbody></table>
</body>
</html>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_66_ChangeUserProfile.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -103,12 +103,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
@@ -183,12 +183,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html 2011-07-14 14:52:00 UTC (rev 6871)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_67_ChangePassword.html 2011-07-15 10:00:09 UTC (rev 6872)
@@ -118,12 +118,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIAccountForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div</td>
+ <td>//form[@id='UIAccountForm']/div[3]/div[2]/a[1]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UIAccountForm']/div[3]/div[2]/table/tbody/tr/td/div[1]/div/div/div</td>
+ <td>//form[@id='UIAccountForm']/div[3]/div[2]/a[1]</td>
<td></td>
</tr>
<tr>
@@ -138,12 +138,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td>
+ <td>//div/div[3]/div/div[2]/div/div/div/div/div/div[3]/div</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[3]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td>
+ <td>//div/div[3]/div/div[2]/div/div/div/div/div/div[3]/div</td>
<td></td>
</tr>
<tr>
@@ -183,7 +183,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -243,12 +243,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//form[@id='UIAccountChangePass']/div[2]/div/div/table/tbody/tr/td/div[1]/div/div/div/a</td>
+ <td>//form[@id='UIAccountChangePass']/div[2]/div/div/a[1]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//form[@id='UIAccountChangePass']/div[2]/div/div/table/tbody/tr/td/div[1]/div/div/div/a</td>
+ <td>//form[@id='UIAccountChangePass']/div[2]/div/div/a[1]</td>
<td></td>
</tr>
<tr>
@@ -263,12 +263,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/a</td>
<td></td>
</tr>
<tr>
@@ -318,7 +318,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
@@ -368,7 +368,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td>//a[@id='UIPortalLoginFormAction']</td>
<td></td>
</tr>
<tr>
13 years, 6 months
- 1
- 0