[gatein-commits] gatein SVN: r6437 - in portal/trunk: component/common/src/main/java/conf and 32 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue May 3 05:54:12 EDT 2011
Author: trong.tran
Date: 2011-05-03 05:54:12 -0400 (Tue, 03 May 2011)
New Revision: 6437
Added:
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java
Removed:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java
Modified:
portal/trunk/
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml
portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml
Log:
GTNPORTAL-1889 Global portlet metadata
Property changes on: portal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
+ /portal/branches/branch-GTNPORTAL-1790:5864-5919
/portal/branches/branch-GTNPORTAL-1822:5938-5991
/portal/branches/branch-GTNPORTAL-1832:5993-6105
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/wsrp-extraction:5828-6031
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-05-03 09:54:12 UTC (rev 6437)
@@ -58,5 +58,8 @@
gatein.email.smtp.socketFactory.port=465
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+#Global portlet.xml
+gatein.portlet.metadata.global=../conf/gatein/portlet.xml
+
# Web
-gatein.web.compressor.js.level=simple
+gatein.web.compressor.js.level=simple
\ No newline at end of file
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-05-03 09:54:12 UTC (rev 6437)
@@ -61,5 +61,8 @@
gatein.email.smtp.socketFactory.port=465
gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+#Global portlet.xml
+gatein.portlet.metadata.global=../gatein/conf/portlet.xml
+
# Web
gatein.web.compressor.js.level=simple
\ No newline at end of file
Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java
===================================================================
--- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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 at 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.metadata.global");
+ 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: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java (from rev 6384, portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java)
===================================================================
--- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java (rev 0)
+++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/GlobalPortletMetaData.java 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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 at 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);
+ }
+}
Copied: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml (from rev 6384, portal/branches/global-portlet-metadata/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml)
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml (rev 0)
+++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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>
Copied: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml (from rev 6384, portal/branches/global-portlet-metadata/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml)
===================================================================
--- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml (rev 0)
+++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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: portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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>
Copied: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java (from rev 6384, portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java)
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java (rev 0)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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 at 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: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java 2011-05-03 04:53:32 UTC (rev 6436)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java 2011-05-03 09:54:12 UTC (rev 6437)
@@ -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
More information about the gatein-commits
mailing list